Merge tag '110.0.5481.177' into stable.lion

# Conflicts: # DEPS # chrome/VERSION # ui/base/clipboard/clipboard_util_mac.mm
blueboxd · Feb 24, 2023 · 2c36570 · 2c36570
2 parents 215530e + 0fe650f
commit 2c36570
Show file tree

Hide file tree

Showing 504 changed files with 4,737 additions and 3,843 deletions.
diff --git a/DEPS b/DEPS
@@ -771,7 +771,7 @@ deps = {
 
   'src/clank': {
     'url': 'https://chrome-internal.googlesource.com/clank/internal/apps.git' + '@' +
-    'af6b41acf323ec0f25da45ca0f527bd508c517e4',
+    '1a2ae51531a8ea25883d8f05c47dac1056f71a4f',
     'condition': 'checkout_android and checkout_src_internal',
   },
 
@@ -1211,7 +1211,7 @@ deps = {
     Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'),
 
   'src/third_party/devtools-frontend-internal': {
-      'url': 'https://chrome-internal.googlesource.com/devtools/devtools-internal.git' + '@' + 'b4c9583c9dfa2baa725205b3c7866b4752a15c32',
+      'url': 'https://chrome-internal.googlesource.com/devtools/devtools-internal.git' + '@' + '536354c8419d28b8d648c42035c06ac6fe5f597a',
     'condition': 'checkout_src_internal',
   },
 
@@ -1366,7 +1366,7 @@ deps = {
     Var('chromium_git') + '/chromium/deps/hunspell_dictionaries.git' + '@' + '41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e',
 
   'src/third_party/icu':
-    Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '1b7d391f0528fb3a4976b7541b387ee04f915f83',
+    Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '7ff1e9befce5567754dc88392dfaa4704e261ab3',
 
   'src/third_party/icu4j': {
       'packages': [
@@ -1426,7 +1426,7 @@ deps = {
     Var('chromium_git') + '/external/libaddressinput.git' + '@' + 'df35d6c42da4fa2759e4cfb592afe33817993b89',
 
   'src/third_party/libaom/source/libaom':
-    Var('aomedia_git') + '/aom.git' + '@' +  'a84503456d4276348da3e80de7569adb1b389a60',
+    Var('aomedia_git') + '/aom.git' + '@' +  '6770d15de0244bde00f67554f70fc8836826902c',
 
   'src/third_party/libavif/src':
     Var('chromium_git') + '/external/github.com/AOMediaCodec/libavif.git' + '@' + Var('libavif_revision'),
@@ -1825,7 +1825,7 @@ deps = {
     Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + 'e583fa45095a98e12cc28748b30c2b1a9e5babcf',
 
   'src/third_party/webrtc':
-    Var('webrtc_git') + '/src.git' + '@' + '1e675c7835f188cd8be228f5da6d3467690355b8',
+    Var('webrtc_git') + '/src.git' + '@' + '218b56e516386cd57c7513197528c3124bcd7ef3',
 
   # Wuffs' canonical repository is at github.com/google/wuffs, but we use
   # Skia's mirror of Wuffs, the same as in upstream Skia's DEPS file.
@@ -1895,7 +1895,7 @@ deps = {
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@da3eca9482f79af5b73f65ffeb6acde9df194eda',
+    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@580782b14a38ec206c8dcf6fffc5cf902c36b4fd',
     'condition': 'checkout_src_internal',
   },
 

diff --git a/ash/assistant/assistant_controller_impl.cc b/ash/assistant/assistant_controller_impl.cc
@@ -20,6 +20,7 @@
 #include "base/bind.h"
 #include "base/memory/scoped_refptr.h"
 #include "chromeos/ash/services/assistant/public/cpp/assistant_browser_delegate.h"
+#include "chromeos/ash/services/assistant/public/cpp/assistant_enums.h"
 #include "chromeos/ash/services/assistant/public/cpp/assistant_prefs.h"
 #include "chromeos/ash/services/assistant/public/cpp/assistant_service.h"
 #include "chromeos/ash/services/assistant/public/cpp/features.h"
@@ -78,9 +79,6 @@ void AssistantControllerImpl::SetAssistant(assistant::Assistant* assistant) {
   assistant_notification_controller_.SetAssistant(assistant);
   assistant_ui_controller_.SetAssistant(assistant);
 
-  OnAccessibilityStatusChanged();
-  OnColorModeChanged(DarkLightModeControllerImpl::Get()->IsDarkModeEnabled());
-
   if (assistant) {
     for (AssistantControllerObserver& observer : observers_)
       observer.OnAssistantReady();
@@ -342,10 +340,17 @@ void AssistantControllerImpl::NotifyUrlOpened(const GURL& url,
 
 void AssistantControllerImpl::OnAssistantStatusChanged(
     assistant::AssistantStatus status) {
-  if (status == assistant::AssistantStatus::NOT_READY) {
-    assistant_volume_control_receiver_.reset();
-    assistant_ui_controller_.CloseUi(
-        assistant::AssistantExitPoint::kUnspecified);
+  switch (status) {
+    case assistant::AssistantStatus::NOT_READY:
+      assistant_volume_control_receiver_.reset();
+      assistant_ui_controller_.CloseUi(
+          assistant::AssistantExitPoint::kUnspecified);
+      break;
+    case assistant::AssistantStatus::READY:
+      OnAccessibilityStatusChanged();
+      OnColorModeChanged(
+          DarkLightModeControllerImpl::Get()->IsDarkModeEnabled());
+      break;
   }
 }
 

diff --git a/ash/assistant/assistant_controller_impl_unittest.cc b/ash/assistant/assistant_controller_impl_unittest.cc
@@ -106,17 +106,20 @@ class AssistantControllerImplTest : public AssistantAshTestBase {
   const AssistantUiModel* ui_model() {
     return AssistantUiController::Get()->GetModel();
   }
-  TestAssistantService* test_assistant_service() {
-    return &test_assistant_service_;
-  }
 
  private:
   MockNewWindowDelegate* new_window_delegate_;
   std::unique_ptr<TestNewWindowDelegateProvider> delegate_provider_;
+};
 
-  // AssistantService must outlive AssistantController as destructor can
-  // reference AssistantService.
-  TestAssistantService test_assistant_service_;
+// Same with `AssistantControllerImplTest` except that this class does not set
+// up an active user in `SetUp`.
+class AssistantControllerImplTestForStartUp
+    : public AssistantControllerImplTest {
+ public:
+  AssistantControllerImplTestForStartUp() {
+    set_up_active_user_in_test_set_up_ = false;
+  }
 };
 
 }  // namespace
@@ -256,19 +259,19 @@ TEST_F(AssistantControllerImplTest, ClosesAssistantUiForFeedbackDeeplink) {
 
 // Dark mode is set to true if the DarkLightMode flag is off. This is determined
 // in DarkLightModeControllerImpl::IsDarkModeEnabled().
-TEST_F(AssistantControllerImplTest, ColorModeIsSetWhenAssistantIsReadyFlagOff) {
+TEST_F(AssistantControllerImplTestForStartUp,
+       ColorModeIsSetWhenAssistantIsReadyFlagOff) {
   base::test::ScopedFeatureList scoped_feature_list;
   scoped_feature_list.InitWithFeatures(
       /*enabled_features=*/{}, /*disabled_features=*/{
           chromeos::features::kDarkLightMode, features::kNotificationsRefresh});
+  SetUpActiveUser();
 
-  controller()->SetAssistant(test_assistant_service());
-
-  ASSERT_TRUE(test_assistant_service()->dark_mode_enabled().has_value());
-  EXPECT_TRUE(test_assistant_service()->dark_mode_enabled().value());
+  ASSERT_TRUE(assistant_service()->dark_mode_enabled().has_value());
+  EXPECT_TRUE(assistant_service()->dark_mode_enabled().value());
 }
 
-TEST_F(AssistantControllerImplTest, ColorModeIsUpdated) {
+TEST_F(AssistantControllerImplTestForStartUp, ColorModeIsUpdated) {
   base::test::ScopedFeatureList feature_list;
   feature_list.InitAndEnableFeature(chromeos::features::kDarkLightMode);
 
@@ -281,18 +284,18 @@ TEST_F(AssistantControllerImplTest, ColorModeIsUpdated) {
   auto* dark_light_mode_controller = DarkLightModeControllerImpl::Get();
   dark_light_mode_controller->OnActiveUserPrefServiceChanged(
       active_user_pref_service);
-  controller()->SetAssistant(test_assistant_service());
+  SetUpActiveUser();
   const bool initial_dark_mode_status =
       dark_light_mode_controller->IsDarkModeEnabled();
-  ASSERT_TRUE(test_assistant_service()->dark_mode_enabled().has_value());
+  ASSERT_TRUE(assistant_service()->dark_mode_enabled().has_value());
   EXPECT_EQ(initial_dark_mode_status,
-            test_assistant_service()->dark_mode_enabled().value());
+            assistant_service()->dark_mode_enabled().value());
 
   // Switch the color mode.
   dark_light_mode_controller->ToggleColorMode();
-  ASSERT_TRUE(test_assistant_service()->dark_mode_enabled().has_value());
+  ASSERT_TRUE(assistant_service()->dark_mode_enabled().has_value());
   EXPECT_NE(initial_dark_mode_status,
-            test_assistant_service()->dark_mode_enabled().value());
+            assistant_service()->dark_mode_enabled().value());
 }
 
 }  // namespace ash
diff --git a/ash/assistant/test/assistant_ash_test_base.cc b/ash/assistant/test/assistant_ash_test_base.cc
@@ -118,7 +118,9 @@ void AssistantAshTestBase::SetUp() {
   test_api_->DisableAnimations();
   EnableKeyboard();
 
-  SetUpActiveUser();
+  if (set_up_active_user_in_test_set_up_) {
+    SetUpActiveUser();
+  }
 }
 
 void AssistantAshTestBase::TearDown() {

diff --git a/ash/assistant/test/assistant_ash_test_base.h b/ash/assistant/test/assistant_ash_test_base.h
@@ -204,9 +204,16 @@ class AssistantAshTestBase : public AshTestBase {
 
   TestAssistantService* assistant_service();
 
- private:
+ protected:
+  // Sets up an active user for a test. Note that this function is called in
+  // `SetUp` by default. You can change this behavior by setting
+  // `set_up_active_user_in_test_set_up_`.
   void SetUpActiveUser();
 
+  // This variable must be set before `SetUp` function call.
+  bool set_up_active_user_in_test_set_up_ = true;
+
+ private:
   std::unique_ptr<AssistantTestApi> test_api_;
   std::unique_ptr<TestAssistantSetup> test_setup_;
   std::unique_ptr<TestAshWebViewFactory> test_web_view_factory_;

diff --git a/ash/shortcut_viewer/strings/shortcut_viewer_strings_ca.xtb b/ash/shortcut_viewer/strings/shortcut_viewer_strings_ca.xtb
@@ -65,7 +65,7 @@
 <translation id="3140353188828248647">Mou el focus a la barra d'adreces</translation>
 <translation id="3256109297135787951">Deixa de destacar un element del prestatge</translation>
 <translation id="3288816184963444640">Tanca la finestra actual</translation>
-<translation id="3322797428033495633">Posa el focus a la finestra de pantalla en pantalla</translation>
+<translation id="3322797428033495633">Posa el focus a la finestra d'imatge sobre imatge</translation>
 <translation id="3350805006883559974">Fes flotar la finestra activa al damunt</translation>
 <translation id="3407560819924487926">Obre el gestor de tasques</translation>
 <translation id="3417835166382867856">Cerca pestanyes</translation>

diff --git a/ash/shortcut_viewer/strings/shortcut_viewer_strings_fi.xtb b/ash/shortcut_viewer/strings/shortcut_viewer_strings_fi.xtb
@@ -130,7 +130,7 @@
 <translation id="5757474750054631686">Himmennä näppäimistö (jos se on taustavalaistu)</translation>
 <translation id="587531134027443617">Poista edellinen sana</translation>
 <translation id="5899919361772749550">Näytä tai piilota Kehittäjien työkalut ‑konsoli</translation>
-<translation id="5919628958418675842">Näytönsuojan ottaminen käyttöön tai poistaminen käytöstä</translation>
+<translation id="5919628958418675842">Yksityisen näkyvyyden laittaminen päälle tai pois päältä</translation>
 <translation id="5921745308587794300">Kierrä ikkunaa</translation>
 <translation id="5926306472221400972">Ota kuvakaappaus koko näytöstä</translation>
 <translation id="6022924867608035986">Tyhjennä hakukentän teksti</translation>

diff --git a/ash/shortcut_viewer/strings/shortcut_viewer_strings_ko.xtb b/ash/shortcut_viewer/strings/shortcut_viewer_strings_ko.xtb
@@ -130,7 +130,7 @@
 <translation id="5757474750054631686">키보드 어둡게(백라이트 키보드만 해당)</translation>
 <translation id="587531134027443617">이전 단어를 삭제</translation>
 <translation id="5899919361772749550">Developer Tools 콘솔 표시 또는 숨기기</translation>
-<translation id="5919628958418675842">개인정보 보호 화면을 사용 설정 또는 중지</translation>
+<translation id="5919628958418675842">개인 정보 보호 화면을 사용 설정 또는 중지</translation>
 <translation id="5921745308587794300">창 회전</translation>
 <translation id="5926306472221400972">전체 화면 스크린샷 촬영</translation>
 <translation id="6022924867608035986">검색창 텍스트 삭제</translation>

diff --git a/ash/shortcut_viewer/strings/shortcut_viewer_strings_my.xtb b/ash/shortcut_viewer/strings/shortcut_viewer_strings_my.xtb
@@ -130,7 +130,7 @@
 <translation id="5757474750054631686">ကီးဘုတ်ကို မှိန်အောင် ပြုလုပ်ရန် (နောက်ခံမီးပါသည့် ကီးဘုတ်များသာ)</translation>
 <translation id="587531134027443617">ယခင်စကားလုံးကို ဖျက်ရန်</translation>
 <translation id="5899919361772749550">'ဆော့ဖ်ဝဲအင်ဂျင်နီယာ ကိရိယာများ' ကွန်ဆိုးလ်ကို ပြရန် သို့မဟုတ် ဝှက်ရန်</translation>
-<translation id="5919628958418675842">ပုဂ္ဂိုလ်ရေးဆိုင်ရာ မျက်နှာပြင်ကို ဖွင့်ရန် သို့မဟုတ် ပိတ်ရန်</translation>
+<translation id="5919628958418675842">အချက်အလက်လုံခြုံမှုဆိုင်ရာ ဖန်သားပြင်ကို ဖွင့်ရန် သို့မဟုတ် ပိတ်ရန်</translation>
 <translation id="5921745308587794300">ဝင်းဒိုးကို လှည့်ပါ</translation>
 <translation id="5926306472221400972">ဖန်သားပြင်အပြည့် ဓာတ်ပုံရိုက်ရန်</translation>
 <translation id="6022924867608035986">ရှာဖွေရန်အကွက်ထဲရှိ စာသားကို ရှင်းလင်းရန်</translation>

diff --git a/ash/shortcut_viewer/strings/shortcut_viewer_strings_or.xtb b/ash/shortcut_viewer/strings/shortcut_viewer_strings_or.xtb
@@ -130,7 +130,7 @@
 <translation id="5757474750054631686">ନିଷ୍ପ୍ରଭ କୀବୋର୍ଡ (କେବଳ ବ୍ୟାକ୍‍ଲିଟ୍‍ କୀବୋର୍ଡ ପାଇଁ)</translation>
 <translation id="587531134027443617">ପୂର୍ବବର୍ତ୍ତୀ ଶଦ୍ଦ ଡିଲିଟ୍‌ କରନ୍ତୁ</translation>
 <translation id="5899919361772749550">ଡେଭଲପର୍ ଟୁଲ୍ କନ୍‍‍ସୋଲ୍ ଦେଖାନ୍ତୁ କିମ୍ବା ଲୁଚାନ୍ତୁ</translation>
-<translation id="5919628958418675842">ଗୋପନୀୟତା ସ୍କ୍ରିନ୍ ଚାଲୁ କିମ୍ବା ବନ୍ଦ କରନ୍ତୁ</translation>
+<translation id="5919628958418675842">ଗୋପନୀୟତା ସ୍କ୍ରିନ ଚାଲୁ କିମ୍ବା ବନ୍ଦ କରନ୍ତୁ</translation>
 <translation id="5921745308587794300">ୱିଣ୍ଡୋ ଘୂରାନ୍ତୁ</translation>
 <translation id="5926306472221400972">ପୂର୍ଣ୍ଣ ସ୍କ୍ରିନର ସ୍କ୍ରିନସଟ୍ ନିଅନ୍ତୁ</translation>
 <translation id="6022924867608035986">ସର୍ଚ୍ଚବକ୍ସ ଟେକ୍ସଟ୍ ଖାଲି କରନ୍ତୁ</translation>

diff --git a/ash/strings/ash_strings_az.xtb b/ash/strings/ash_strings_az.xtb
@@ -1235,7 +1235,7 @@ Yeni quraşdırma</translation>
 <translation id="7742327441377685481">Bildiriş yoxdur</translation>
 <translation id="7749443890790263709">Maksimum masa sayına çatmısınız.</translation>
 <translation id="776344839111254542">Güncəlləmə detallarını görmək üçün klikləyin</translation>
-<translation id="7768784765476638775">Seç və Dinlə</translation>
+<translation id="7768784765476638775">Seçib səsləndirmə</translation>
 <translation id="7780094051999721182">qısayollar</translation>
 <translation id="7780159184141939021">Ekranı fırladın</translation>
 <translation id="7796353162336583443">Qeyd etmək, skrinşot çəkmək Google Assistentdən, lazer işarəsindən və ya lupadan istifadə etmək üçün fırça düyməsinə klikləyin.</translation>

diff --git a/ash/strings/ash_strings_ca.xtb b/ash/strings/ash_strings_ca.xtb
@@ -1000,7 +1000,7 @@ Connecta el dispositiu a l'alimentació.</translation>
 <translation id="6490471652906364588">Dispositiu USB-C (port dret)</translation>
 <translation id="6491071886865974820"><ph name="MANAGER" /> requereix que actualitzis el dispositiu <ph name="DEVICE_TYPE" /> abans del termini establert</translation>
 <translation id="649452524636452238">PIN de la targeta intel·ligent</translation>
-<translation id="6495400115277918834">S'ha iniciat la pantalla en pantalla; prem Alt+Maj+V per posar-hi el focus</translation>
+<translation id="6495400115277918834">S'ha iniciat la imatge sobre imatge; prem Alt+Maj+V per posar-hi el focus</translation>
 <translation id="6497418457565568043">El mode No molestis està activat</translation>
 <translation id="6500896621837555595">Actualitza</translation>
 <translation id="6501401484702599040">S'està emetent la pantalla a <ph name="RECEIVER_NAME" /></translation>

diff --git a/ash/strings/ash_strings_cs.xtb b/ash/strings/ash_strings_cs.xtb
@@ -117,7 +117,7 @@ Pro začátek můžete vyzkoušet třeba tohle.</translation>
 <translation id="1520303207432623762">{NUM_APPS,plural, =1{Zobrazit nastavení oznámení. U jedné aplikace jsou oznámení vypnutá}few{Zobrazit nastavení oznámení. U # aplikací jsou oznámení vypnutá}many{Zobrazit nastavení oznámení. U # aplikace jsou oznámení vypnutá}other{Zobrazit nastavení oznámení. U # aplikací jsou oznámení vypnutá}}</translation>
 <translation id="1525508553941733066">ZAVŘÍT</translation>
 <translation id="1528259147807435347">Upraveno v uplynulém týdnu</translation>
-<translation id="1536604384701784949">Pokud chcete použít účet <ph name="USER_EMAIL_ADDRESS" />, bude nutné se nejprve odhlásit od všech dalších účtů. Pokud se chcete odhlásit, vraťte se zpět pomocí tlačítka Zrušit. Poté výběrem času otevřete stavovou oblast a vyberte Odhlásit se. Poté se přihlaste k účtu <ph name="USER_EMAIL_ADDRESS_2" />.</translation>
+<translation id="1536604384701784949">Pokud chcete použít účet <ph name="USER_EMAIL_ADDRESS" />, bude nutné se nejprve odhlásit ze všech dalších účtů. Pokud se chcete odhlásit, vraťte se zpět pomocí tlačítka Zrušit. Poté výběrem času otevřete stavovou oblast a vyberte Odhlásit se. Poté se přihlaste k účtu <ph name="USER_EMAIL_ADDRESS_2" />.</translation>
 <translation id="15373452373711364">Velký kurzor myši</translation>
 <translation id="1546492247443594934">Plocha 2</translation>
 <translation id="1546930421365146760">Požádejte svého administrátora, aby toto zařízení nastavil v administrátorské konzoli Google</translation>

diff --git a/ash/strings/ash_strings_en-GB.xtb b/ash/strings/ash_strings_en-GB.xtb
@@ -224,7 +224,7 @@ Here are some things that you can try to get started.</translation>
 <translation id="2088116547584365419">games</translation>
 <translation id="209965399369889474">Not connected to network</translation>
 <translation id="2107914222138020205">Your USB-C cable does not support Thunderbolt. Device performance may be limited.</translation>
-<translation id="2108303511227308752">The Alt + backspace keyboard shortcut has changed. To use the delete key, press the <ph name="LAUNCHER_KEY_NAME" /> key + backspace.</translation>
+<translation id="2108303511227308752">The Alt + Backspace keyboard shortcut has changed. To use the Delete key, press the <ph name="LAUNCHER_KEY_NAME" /> key + Backspace.</translation>
 <translation id="2126242104232412123">New desk</translation>
 <translation id="2132302418721800944">Record full screen</translation>
 <translation id="2135456203358955318">Docked magnifier</translation>
@@ -595,7 +595,7 @@ Connect your device to power.</translation>
 <translation id="425364040945105958">No SIM</translation>
 <translation id="4261870227682513959">Show notification settings. Notifications are off</translation>
 <translation id="4269883910223712419">The admin of this device has the ability to:</translation>
-<translation id="4274537685965975248">The Ctrl + Alt + down arrow keyboard shortcut has changed. To use the End key, press the <ph name="LAUNCHER_KEY_NAME" /> key + right arrow.</translation>
+<translation id="4274537685965975248">The Ctrl + Alt + Down Arrow keyboard shortcut has changed. To use the End key, press the <ph name="LAUNCHER_KEY_NAME" /> key + Right Arrow.</translation>
 <translation id="4279490309300973883">Mirroring</translation>
 <translation id="4283888303416325161">Enter password for more security</translation>
 <translation id="4285498937028063278">Unpin</translation>
@@ -631,7 +631,7 @@ Connect your device to power.</translation>
 <translation id="4445159312344259901">Sign in to unlock</translation>
 <translation id="4449692009715125625">{NUM_NOTIFICATIONS,plural, =1{1 important notification}other{# important notifications}}</translation>
 <translation id="4450893287417543264">Don't show again</translation>
-<translation id="4451374464530248585">The Alt + down arrow keyboard shortcut has changed. To use the page down key, press the <ph name="LAUNCHER_KEY_NAME" /> key + down arrow.</translation>
+<translation id="4451374464530248585">The Alt + Down Arrow keyboard shortcut has changed. To use the Page Down key, press the <ph name="LAUNCHER_KEY_NAME" /> key + Down Arrow.</translation>
 <translation id="4455051983450390249">View your phone's notifications on your <ph name="DEVICE_TYPE" /></translation>
 <translation id="445864333228800152">Good evening,</translation>
 <translation id="4458688154122353284">Stop screen recording</translation>