[pull] main from chromium:main

DEPS

@@ -306,15 +306,15 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling catapult
   # and whatever else without interference from each other.
-  'catapult_revision': '1ba82f650c64340d5f581522efa511ceea415c0b',
+  'catapult_revision': 'e3f9ae73db5135ad998108113af7ef82a47efc51',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libFuzzer
   # and whatever else without interference from each other.
   'libfuzzer_revision': 'debe7d2d1982e540fbd6bd78604bf001753f9e74',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling devtools-frontend
   # and whatever else without interference from each other.
-  'devtools_frontend_revision': 'a84185e6b5be9c88f8aad0fa589ab7c213d77e5d',
+  'devtools_frontend_revision': 'a1121f966ce5590b46706befdf60e3350a5cf2d1',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libprotobuf-mutator
   # and whatever else without interference from each other.
@@ -635,7 +635,7 @@ deps = {
   },
 
   'src/ios/third_party/material_components_ios/src': {
-      'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + 'fc61c312d9bd1650f8bb558359c3e179900bc94d',
+      'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + 'fae0808b93a28b00796cdf10d3f50e16aaf2d71e',
       'condition': 'checkout_ios',
   },
 
@@ -1741,7 +1741,7 @@ deps = {
     'packages': [
       {
         'package': 'chromeos_internal/apps/projector_app/app',
-        'version': 'GNNkSm3f-_u5XLEkNk_gDIcdzAc9jLL9kkDHNH94I1kC',
+        'version': 'FchxTKMvfxSkGTLMU23cSyqvexH52wHP-zPlLYF6QqUC',
       },
     ],
     'condition': 'checkout_chromeos and checkout_src_internal',
@@ -2543,7 +2543,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_google_android_material_material',
-              'version': 'version:2@1.5.0-alpha05.cr0',
+              'version': 'version:2@1.6.0-alpha01.cr0',
           },
       ],
       'condition': 'checkout_android',

android_webview/browser/aw_content_browser_client.cc

@@ -494,7 +494,7 @@ bool AwContentBrowserClient::CanCreateWindow(
 
 base::FilePath AwContentBrowserClient::GetDefaultDownloadDirectory() {
   // Android WebView does not currently use the Chromium downloads system.
-  // Download requests are cancelled immedately when recognized; see
+  // Download requests are cancelled immediately when recognized; see
   // AwResourceDispatcherHost::CreateResourceHandlerForDownload. However the
   // download system still tries to start up and calls this before recognizing
   // the request has been cancelled.

android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java

@@ -203,6 +203,8 @@ private ProductionSupportedFlagList() {}
                             + " PageTimeSpent."),
             Flag.baseFeature(BlinkFeatures.FORCE_MAJOR_VERSION100_IN_USER_AGENT,
                     "Force the Chrome major version number to 100 in the User-Agent string."),
+            Flag.baseFeature(BlinkFeatures.FORCE_MINOR_VERSION100_IN_USER_AGENT,
+                    "Force the Chrome minor version number to 100 in the User-Agent string."),
             Flag.baseFeature(NetworkServiceFeatures.URL_LOADER_SYNC_CLIENT,
                     "Optimizes communication between URLLoader and CorsURLLoader."),
             Flag.baseFeature(BlinkFeatures.SET_TIMEOUT_WITHOUT_CLAMP,

android_webview/javatests/src/org/chromium/android_webview/test/AwAutofillTest.java

@@ -918,6 +918,7 @@ public void tearDown() {
     @Test
     @SmallTest
     @Feature({"AndroidWebView"})
+    @DisabledTest(message = "https://crbug.com/1279813")
     public void testTouchingFormWithAdjustResize() throws Throwable {
         PostTask.runOrPostTask(UiThreadTaskTraits.DEFAULT, () -> {
             mRule.getActivity().getWindow().setSoftInputMode(
@@ -1146,6 +1147,7 @@ public void testAutofillTriggersAfterReload() throws Throwable {
     @Test
     @SmallTest
     @Feature({"AndroidWebView"})
+    @DisabledTest(message = "https://crbug.com/1279813")
     public void testNotifyVirtualValueChanged() throws Throwable {
         final String data = "<html><head></head><body><form action='a.html' name='formname'>"
                 + "<input type='text' id='text1' name='username'"
@@ -1180,6 +1182,7 @@ public void testNotifyVirtualValueChanged() throws Throwable {
     @Test
     @SmallTest
     @Feature({"AndroidWebView"})
+    @DisabledTest(message = "https://crbug.com/1279813")
     public void testJavascriptNotTriggerNotifyVirtualValueChanged() throws Throwable {
         final String data = "<html><head></head><body><form action='a.html' name='formname'>"
                 + "<input type='text' id='text1' name='username'"
@@ -1304,6 +1307,7 @@ public void testMovingToOtherForm() throws Throwable {
     @Test
     @SmallTest
     @Feature({"AndroidWebView"})
+    @DisabledTest(message = "https://crbug.com/1279813")
     public void testSwitchFromIFrame() throws Throwable {
         // we intentionally load main frame and iframe from the same URL and make both have the
         // similar form, so the new session is triggered by frame change
@@ -1518,6 +1522,7 @@ public void testNoSubmissionWithoutFillingForm() throws Throwable {
     @Feature({"AndroidWebView"})
     @DisableIf.Build(sdk_is_less_than = Build.VERSION_CODES.P,
             message = "This test is disabled on Android O because of https://crbug.com/997362")
+    @DisabledTest(message = "https://crbug.com/1279813")
     public void
     testSelectControlChangeNotification() throws Throwable {
         int cnt = 0;
@@ -2053,6 +2058,7 @@ public void testUMAAutofillCreatedByActivityContext() {
     @Test
     @SmallTest
     @Feature({"AndroidWebView"})
+    @DisabledTest(message = "https://crbug.com/1279813")
     public void testPageScrollTriggerViewExitAndEnter() throws Throwable {
         final String data = "<html><head></head><body><form action='a.html' name='formname'>"
                 + "<input type='text' id='text1' name='username'"
@@ -2672,6 +2678,7 @@ public void testFieldAddedBeforeSuggestionSelected() throws Throwable {
     @Test
     @SmallTest
     @Feature({"AndroidWebView"})
+    @DisabledTest(message = "https://crbug.com/1279813")
     public void testFirstFieldRemovedBeforeSuggestionSelected() throws Throwable {
         // This test verifies that form filling works even if an element of the form that was
         // supposed to be filled has been deleted between the time of decision to fill the form and

ash/app_list/app_list_bubble_event_filter.cc

@@ -21,7 +21,6 @@ AppListBubbleEventFilter::AppListBubbleEventFilter(
     base::RepeatingCallback<void()> on_click_outside)
     : widget_(widget), button_(button), on_click_outside_(on_click_outside) {
   DCHECK(widget_);
-  DCHECK(button_);
   DCHECK(on_click_outside_);
   Shell::Get()->AddPreTargetHandler(this);
 }
@@ -30,6 +29,10 @@ AppListBubbleEventFilter::~AppListBubbleEventFilter() {
   Shell::Get()->RemovePreTargetHandler(this);
 }
 
+void AppListBubbleEventFilter::SetButton(views::View* button) {
+  button_ = button;
+}
+
 void AppListBubbleEventFilter::OnMouseEvent(ui::MouseEvent* event) {
   if (event->type() == ui::ET_MOUSE_PRESSED)
     ProcessPressedEvent(*event);
@@ -56,10 +59,12 @@ void AppListBubbleEventFilter::ProcessPressedEvent(
   // Ignore clicks that hit the button (which usually spawned the widget).
   // Use HitTestPoint() because the shelf home button has a custom view targeter
   // that handles clicks outside its bounds, like in the corner of the screen.
-  gfx::Point point_in_button = event_location;
-  views::View::ConvertPointFromScreen(button_, &point_in_button);
-  if (button_->HitTestPoint(point_in_button))
-    return;
+  if (button_) {
+    gfx::Point point_in_button = event_location;
+    views::View::ConvertPointFromScreen(button_, &point_in_button);
+    if (button_->HitTestPoint(point_in_button))
+      return;
+  }
 
   on_click_outside_.Run();
 }

ash/app_list/app_list_bubble_event_filter.h

@@ -37,6 +37,10 @@ class ASH_EXPORT AppListBubbleEventFilter : public ui::EventHandler {
   AppListBubbleEventFilter& operator=(const AppListBubbleEventFilter&) = delete;
   ~AppListBubbleEventFilter() override;
 
+  // Changes the button to check (see class comment). Useful if the app list
+  // has changed displays, so a different home button needs to be checked.
+  void SetButton(views::View* button);
+
   // ui::EventHandler:
   void OnMouseEvent(ui::MouseEvent* event) override;
   void OnTouchEvent(ui::TouchEvent* event) override;
@@ -45,7 +49,7 @@ class ASH_EXPORT AppListBubbleEventFilter : public ui::EventHandler {
   void ProcessPressedEvent(const ui::LocatedEvent& event);
 
   views::Widget* const widget_;
-  views::View* const button_;
+  views::View* button_;  // May be null.
   base::RepeatingClosure on_click_outside_;
 };