[pull] main from chromium:main

DEPS

@@ -320,7 +320,7 @@ vars = {
   # 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': '12bcadba35805a2209e10bed6dbd8ee19b2558a8',
+  'devtools_frontend_revision': 'd3307fe8ab11976e262d29f679b6ec894dbc662c',
   # 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.
@@ -805,7 +805,7 @@ deps = {
     'packages': [
       {
           'package': 'chromium/third_party/androidx',
-          'version': 'I4RRLMv8zGb2YSObwLllOCmDGxCPRT9KyzAV-BFZo_0C',
+          'version': '6d8ij5pzYh29WWjPbdbAWFBJSA1nUgkWf2p6wCVZKIsC',
       },
     ],
     'condition': 'checkout_android',
@@ -1648,7 +1648,7 @@ deps = {
     Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + 'c843f8d63c8c17acfbb7d48e09059a581ba779b9',
 
   'src/third_party/webrtc':
-    Var('webrtc_git') + '/src.git' + '@' + '8d87c463d9de459c1fa74289e9ad0496bc296e96',
+    Var('webrtc_git') + '/src.git' + '@' + '9754a43403e0b955546aff0e7d07d6f70def4043',
 
   'src/third_party/libgifcodec':
      Var('skia_git') + '/libgifcodec' + '@'+  Var('libgifcodec_revision'),

PRESUBMIT.py

@@ -3467,6 +3467,22 @@ def _CheckAndroidXmlStyle(input_api, output_api, is_check_on_upload):
   else:
     return checkxmlstyle.CheckStyleOnCommit(input_api, output_api)
 
+def _CheckAndroidInfoBarDeprecation(input_api, output_api):
+  """Checks Android Infobar Deprecation """
+
+  import sys
+  original_sys_path = sys.path
+  try:
+    sys.path = sys.path + [input_api.os_path.join(
+        input_api.PresubmitLocalPath(), 'tools', 'android',
+        'infobar_deprecation')]
+    import infobar_deprecation
+  finally:
+    # Restore sys.path to what it was before.
+    sys.path = original_sys_path
+
+  return infobar_deprecation.CheckDeprecationOnUpload(input_api, output_api)
+
 
 class PydepsChecker(object):
   def __init__(self, input_api, pydeps_files):
@@ -4166,6 +4182,7 @@ def ChecksAndroidSpecificOnUpload(input_api, output_api):
   results.extend(_CheckAndroidXmlStyle(input_api, output_api, True))
   results.extend(_CheckNewImagesWarning(input_api, output_api))
   results.extend(_CheckAndroidNoBannedImports(input_api, output_api))
+  results.extend(_CheckAndroidInfoBarDeprecation(input_api, output_api))
   return results
 
 def ChecksAndroidSpecificOnCommit(input_api, output_api):

ash/accelerators/accelerator_controller_unittest.cc

@@ -67,6 +67,7 @@
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/metrics/user_action_tester.h"
 #include "base/test/scoped_feature_list.h"
+#include "chromeos/ui/base/window_state_type.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "components/prefs/pref_service.h"
 #include "media/base/media_switches.h"
@@ -606,9 +607,13 @@ TEST_F(AcceleratorControllerTest, WindowSnap) {
 
     controller_->PerformActionIfEnabled(TOGGLE_MAXIMIZED, {});
     EXPECT_FALSE(window_state->IsMaximized());
-    // Window gets restored to its restore bounds since side-maximized state
-    // is treated as a "maximized" state.
-    EXPECT_EQ(normal_bounds.ToString(), window->bounds().ToString());
+
+    // Window gets restored to its right snapped window bounds and its window
+    // state should also restore to the right snapped window state.
+    gfx::Rect expected_bounds = GetDefaultSnappedWindowBoundsInParent(
+        window.get(), SnapViewType::kSecondary);
+    EXPECT_EQ(expected_bounds.ToString(), window->bounds().ToString());
+    EXPECT_EQ(window_state->GetStateType(), WindowStateType::kSecondarySnapped);
 
     controller_->PerformActionIfEnabled(TOGGLE_MAXIMIZED, {});
     controller_->PerformActionIfEnabled(WINDOW_CYCLE_SNAP_LEFT, {});

ash/ambient/ambient_controller.cc

@@ -418,7 +418,7 @@ void AmbientController::SuspendDone(base::TimeDelta sleep_duration) {
 }
 
 void AmbientController::OnAuthScanDone(
-    device::mojom::ScanResult scan_result,
+    const device::mojom::FingerprintMessagePtr msg,
     const base::flat_map<std::string, std::vector<std::string>>& matches) {
   DismissUI();
 }

ash/ambient/ambient_controller.h

@@ -85,7 +85,7 @@ class ASH_EXPORT AmbientController
 
   // fingerprint::mojom::FingerprintObserver:
   void OnAuthScanDone(
-      device::mojom::ScanResult scan_result,
+      const device::mojom::FingerprintMessagePtr msg,
       const base::flat_map<std::string, std::vector<std::string>>& matches)
       override;
   void OnSessionFailed() override {}

ash/app_list/views/app_list_bubble_view.cc

@@ -348,9 +348,11 @@ void AppListBubbleView::ShowPage(AppListBubblePage page) {
     case AppListBubblePage::kApps:
     case AppListBubblePage::kSearch:
       search_box_view_->SetSearchBoxActive(true, /*event_type=*/ui::ET_UNKNOWN);
+      // Explicitly request focus in case the search box was active before.
+      search_box_view_->search_box()->RequestFocus();
       break;
     case AppListBubblePage::kAssistant:
-      // Explicitly set search box inactive so the next attempt to active it
+      // Explicitly set search box inactive so the next attempt to activate it
       // will succeed.
       search_box_view_->SetSearchBoxActive(false,
                                            /*event_type=*/ui::ET_UNKNOWN);
@@ -556,6 +558,9 @@ void AppListBubbleView::OnHideAnimationEnded(const gfx::Rect& layer_bounds) {
   // Restore the layer bounds. This isn't visible because opacity is 0.
   layer()->SetBounds(layer_bounds);
 
+  // Hide any open folder by showing the apps page.
+  ShowApps(/*folder_item_view=*/nullptr, /*select_folder=*/false);
+
   if (on_hide_animation_ended_)
     std::move(on_hide_animation_ended_).Run();
 }

ash/app_list/views/app_list_bubble_view_unittest.cc

@@ -123,6 +123,8 @@ class AppListBubbleViewTest : public AshTestBase {
   // Shows the app list on the primary display.
   void ShowAppList() { GetAppListTestHelper()->ShowAppList(); }
 
+  void DismissAppList() { GetAppListTestHelper()->Dismiss(); }
+
   void AddContinueSuggestionResult(int num_suggestions) {
     GetAppListTestHelper()->AddContinueSuggestionResults(num_suggestions);
   }
@@ -430,6 +432,26 @@ TEST_F(AppListBubbleViewTest, OpeningBubbleFocusesSearchBox) {
   EXPECT_TRUE(search_box_view->is_search_box_active());
 }
 
+TEST_F(AppListBubbleViewTest, OpeningBubbleTwiceFocusesSearchBox) {
+  AddAppItems(1);
+  ShowAppList();
+
+  // Click on an item, which takes focus out of the search field.
+  AppListItemView* item =
+      GetAppListTestHelper()->GetScrollableAppsGridView()->GetItemViewAt(0);
+  LeftClickOn(item);
+  SearchBoxView* search_box_view = GetSearchBoxView();
+  ASSERT_FALSE(search_box_view->search_box()->HasFocus());
+
+  // The app list view and widget are cached after this close.
+  DismissAppList();
+
+  // Search box is focused on next show.
+  ShowAppList();
+  EXPECT_TRUE(search_box_view->search_box()->HasFocus());
+  EXPECT_TRUE(search_box_view->is_search_box_active());
+}
+
 TEST_F(AppListBubbleViewTest, SearchBoxTextUsesPrimaryTextColor) {
   ShowAppList();
 
@@ -843,6 +865,24 @@ TEST_F(AppListBubbleViewTest, ClickOnFolderOpensFolder) {
   EXPECT_TRUE(GetAppListTestHelper()->GetBubbleFolderView()->GetVisible());
 }
 
+TEST_F(AppListBubbleViewTest, FolderClosedOnAppListDismiss) {
+  AddFolderWithApps(3);
+  ShowAppList();
+
+  AppListItemView* folder_item = GetAppsGridView()->GetItemViewAt(0);
+  LeftClickOn(folder_item);
+  ASSERT_TRUE(GetAppListTestHelper()->IsInFolderView());
+  ASSERT_TRUE(GetAppListTestHelper()->GetBubbleFolderView()->GetVisible());
+
+  // The bubble view and widget are cached after dismiss.
+  DismissAppList();
+
+  // The folder is closed when the app list is reopened.
+  ShowAppList();
+  EXPECT_FALSE(GetAppListTestHelper()->IsInFolderView());
+  EXPECT_FALSE(GetAppListTestHelper()->GetBubbleFolderView()->GetVisible());
+}
+
 TEST_F(AppListBubbleViewTest, LargeFolderViewFitsInsideMainBubble) {
   // Create more apps than fit in the default sized folder.
   AddFolderWithApps(30);

ash/quick_pair/common/fast_pair/fast_pair_metrics.cc

@@ -27,6 +27,32 @@ const char kRetroactivePairingResultMetric[] =
     "Bluetooth.ChromeOS.FastPair.RetroactivePairing.Result";
 const char kTotalGattConnectionTimeMetric[] =
     "Bluetooth.ChromeOS.FastPair.TotalGattConnectionTime";
+const char kFastPairPairFailureInitialMetric[] =
+    "Bluetooth.ChromeOS.FastPair.PairFailure.InitialPairingProtocol";
+const char kFastPairPairFailureSubsequentMetric[] =
+    "Bluetooth.ChromeOS.FastPair.PairFailure.SubsequentPairingProtocol";
+const char kFastPairPairFailureRetroactiveMetric[] =
+    "Bluetooth.ChromeOS.FastPair.PairFailure.RetroactivePairingProtocol";
+const char kFastPairPairResultInitialMetric[] =
+    "Bluetooth.ChromeOS.FastPair.Pairing.Result.InitialPairingProtocol";
+const char kFastPairPairResultSubsequentMetric[] =
+    "Bluetooth.ChromeOS.FastPair.Pairing.Result.SubsequentPairingProtocol";
+const char kFastPairPairResultRetroactiveMetric[] =
+    "Bluetooth.ChromeOS.FastPair.Pairing.Result.RetroactivePairingProtocol";
+const char kFastPairAccountKeyWriteResultInitialMetric[] =
+    "Bluetooth.ChromeOS.FastPair.AccountKeyWrite.Result.InitialPairingProtocol";
+const char kFastPairAccountKeyWriteResultSubsequentMetric[] =
+    "Bluetooth.ChromeOS.FastPair.AccountKeyWrite.Result."
+    "SubsequentPairingProtocol";
+const char kFastPairAccountKeyWriteResultRetroactiveMetric[] =
+    "Bluetooth.ChromeOS.FastPair.AccountKeyWrite.Result."
+    "RetroactivePairingProtocol";
+const char kFastPairAccountKeyWriteFailureInitialMetric[] =
+    "Bluetooth.ChromeOS.FastPair.AccountKeyFailure.InitialPairingProtocol";
+const char kFastPairAccountKeyWriteFailureSubsequentMetric[] =
+    "Bluetooth.ChromeOS.FastPair.AccountKeyFailure.SubsequentPairingProtocol";
+const char kFastPairAccountKeyWriteFailureRetroactiveMetric[] =
+    "Bluetooth.ChromeOS.FastPair.AccountKeyFailure.RetroactivePairingProtocol";
 
 }  // namespace
 
@@ -91,5 +117,71 @@ void RecordTotalGattConnectionTime(base::TimeDelta total_gatt_connection_time) {
                           total_gatt_connection_time);
 }
 
+void RecordPairingResult(const Device& device, bool success) {
+  switch (device.protocol) {
+    case Protocol::kFastPairInitial:
+      base::UmaHistogramBoolean(kFastPairPairResultInitialMetric, success);
+      break;
+    case Protocol::kFastPairRetroactive:
+      base::UmaHistogramBoolean(kFastPairPairResultRetroactiveMetric, success);
+      break;
+    case Protocol::kFastPairSubsequent:
+      base::UmaHistogramBoolean(kFastPairPairResultSubsequentMetric, success);
+      break;
+  }
+}
+
+void RecordPairingFailureReason(const Device& device, PairFailure failure) {
+  switch (device.protocol) {
+    case Protocol::kFastPairInitial:
+      base::UmaHistogramSparse(kFastPairPairFailureInitialMetric,
+                               static_cast<int>(failure));
+      break;
+    case Protocol::kFastPairRetroactive:
+      base::UmaHistogramSparse(kFastPairPairFailureRetroactiveMetric,
+                               static_cast<int>(failure));
+      break;
+    case Protocol::kFastPairSubsequent:
+      base::UmaHistogramSparse(kFastPairPairFailureSubsequentMetric,
+                               static_cast<int>(failure));
+      break;
+  }
+}
+
+void RecordAccountKeyFailureReason(const Device& device,
+                                   AccountKeyFailure failure) {
+  switch (device.protocol) {
+    case Protocol::kFastPairInitial:
+      base::UmaHistogramSparse(kFastPairAccountKeyWriteFailureInitialMetric,
+                               static_cast<int>(failure));
+      break;
+    case Protocol::kFastPairRetroactive:
+      base::UmaHistogramSparse(kFastPairAccountKeyWriteFailureRetroactiveMetric,
+                               static_cast<int>(failure));
+      break;
+    case Protocol::kFastPairSubsequent:
+      base::UmaHistogramSparse(kFastPairAccountKeyWriteFailureSubsequentMetric,
+                               static_cast<int>(failure));
+      break;
+  }
+}
+
+void RecordAccountKeyResult(const Device& device, bool success) {
+  switch (device.protocol) {
+    case Protocol::kFastPairInitial:
+      base::UmaHistogramBoolean(kFastPairAccountKeyWriteResultInitialMetric,
+                                success);
+      break;
+    case Protocol::kFastPairRetroactive:
+      base::UmaHistogramBoolean(kFastPairAccountKeyWriteResultRetroactiveMetric,
+                                success);
+      break;
+    case Protocol::kFastPairSubsequent:
+      base::UmaHistogramBoolean(kFastPairAccountKeyWriteResultSubsequentMetric,
+                                success);
+      break;
+  }
+}
+
 }  // namespace quick_pair
 }  // namespace ash

ash/quick_pair/common/fast_pair/fast_pair_metrics.h

@@ -5,8 +5,11 @@
 #ifndef ASH_QUICK_PAIR_COMMON_FAST_PAIR_FAST_PAIR_METRICS_H_
 #define ASH_QUICK_PAIR_COMMON_FAST_PAIR_FAST_PAIR_METRICS_H_
 
+#include "ash/quick_pair/common/account_key_failure.h"
+#include "ash/quick_pair/common/pair_failure.h"
 #include "base/component_export.h"
 #include "base/time/time.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace ash {
 namespace quick_pair {
@@ -78,6 +81,19 @@ void RecordRetroactivePairingResult(bool success);
 COMPONENT_EXPORT(QUICK_PAIR_COMMON)
 void RecordTotalGattConnectionTime(base::TimeDelta total_gatt_connection_time);
 
+COMPONENT_EXPORT(QUICK_PAIR_COMMON)
+void RecordPairingFailureReason(const Device& device, PairFailure failure);
+
+COMPONENT_EXPORT(QUICK_PAIR_COMMON)
+void RecordPairingResult(const Device& device, bool success);
+
+COMPONENT_EXPORT(QUICK_PAIR_COMMON)
+void RecordAccountKeyFailureReason(const Device& device,
+                                   AccountKeyFailure failure);
+
+COMPONENT_EXPORT(QUICK_PAIR_COMMON)
+void RecordAccountKeyResult(const Device& device, bool success);
+
 }  // namespace quick_pair
 }  // namespace ash
 

ash/quick_pair/common/pair_failure.h

@@ -11,6 +11,9 @@
 namespace ash {
 namespace quick_pair {
 
+// These values are persisted to logs. Entries should not be renumbered and
+// numeric values should never be reused. This enum should be kept in sync with
+// the FastPairPairFailure enum in src/tools/metrics/histograms/enums.xml.
 enum class PairFailure {
   // Failed to create a GATT connection to the device.
   kCreateGattConnection = 0,

ash/quick_pair/keyed_service/quick_pair_metrics_logger.cc

@@ -62,6 +62,7 @@ void QuickPairMetricsLogger::DevicePairedChanged(
 void QuickPairMetricsLogger::OnDevicePaired(scoped_refptr<Device> device) {
   AttemptRecordingFastPairEngagementFlow(
       *device, FastPairEngagementFlowEvent::kPairingSucceeded);
+  RecordPairingResult(*device, /*success=*/true);
   feature_usage_metrics_logger_->RecordUsage(/*success=*/true);
 
   base::TimeDelta total_pair_time =
@@ -89,6 +90,8 @@ void QuickPairMetricsLogger::OnPairFailure(scoped_refptr<Device> device,
   AttemptRecordingTotalUxPairTime(*device, total_pair_time);
 
   feature_usage_metrics_logger_->RecordUsage(/*success=*/false);
+  RecordPairingFailureReason(*device, failure);
+  RecordPairingResult(*device, /*success=*/false);
 }
 
 void QuickPairMetricsLogger::OnDiscoveryAction(scoped_refptr<Device> device,
@@ -206,10 +209,16 @@ void QuickPairMetricsLogger::OnAssociateAccountAction(
 void QuickPairMetricsLogger::OnAccountKeyWrite(
     scoped_refptr<Device> device,
     absl::optional<AccountKeyFailure> error) {
-  if (device->protocol != Protocol::kFastPairRetroactive)
+  if (device->protocol == Protocol::kFastPairRetroactive)
+    RecordRetroactivePairingResult(/*success=*/!error.has_value());
+
+  if (error) {
+    RecordAccountKeyResult(*device, /*success=*/false);
+    RecordAccountKeyFailureReason(*device, error.value());
     return;
+  }
 
-  RecordRetroactivePairingResult(/*success=*/!error.has_value());
+  RecordAccountKeyResult(*device, /*success=*/true);
 }
 
 void QuickPairMetricsLogger::OnCompanionAppAction(scoped_refptr<Device> device,