[pull] master from chromium:master

DEPS

@@ -231,11 +231,11 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and whatever else without interference from each other.
-  'skia_revision': 'aeb5d4daed3ab8927c80db3904dc0f8c24169afa',
+  'skia_revision': '496b89cb74b389b0a1047919275033ef0630416e',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
-  'v8_revision': '0c958868d79796808af29df2902e39870e412d90',
+  'v8_revision': '5ffc282852046908b5497661cb464cb90ce649cd',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ANGLE
   # and whatever else without interference from each other.
@@ -306,7 +306,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': '10474d9f680fe879beb6bfcc21e9baade89d3845',
+  'devtools_frontend_revision': 'fdb326ff691d3e871b03c6a598cb7f662ad051fe',
   # 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.
@@ -1633,7 +1633,7 @@ deps = {
     Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + 'b0291fd966b55a5efc496772555b94842bde1085',
 
   'src/third_party/webrtc':
-    Var('webrtc_git') + '/src.git' + '@' + 'b6a73b69233ce00df85bf173eca94b6fc5e35fd1',
+    Var('webrtc_git') + '/src.git' + '@' + '96168abfb74cd800f2e18e7dcca5bed72ef36e2d',
 
   'src/third_party/libgifcodec':
      Var('skia_git') + '/libgifcodec' + '@'+  Var('libgifcodec_revision'),
@@ -1691,7 +1691,7 @@ deps = {
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@9ffa7a4a05e1d8d499c9f3b16c8e9da37ac57fb4',
+    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@1d1771262535bb72ea053a7c22f4a10fc9cc73c5',
     'condition': 'checkout_src_internal',
   },
 
@@ -1710,7 +1710,7 @@ deps = {
     'packages': [
       {
         'package': 'chromeos_internal/apps/help_app/app',
-        'version': 'd6i23O0euIf4Q8_opLtD2ixVDKSOjinVtVdZjH-1trsC',
+        'version': 'YACky8ppLFM0FXPDau15wHt9xmw-BVM8HKnMLz5HQXgC',
       },
     ],
     'condition': 'checkout_chromeos and checkout_src_internal',
@@ -1721,7 +1721,7 @@ deps = {
     'packages': [
       {
         'package': 'chromeos_internal/apps/media_app/app',
-        'version': 'q7EI3XbKu_Tpmjk0tux1DEf-cn_wHHxhx27QLkdqBXUC',
+        'version': 'VGbkbIQy4l5j2gmve_60OzV-VQA2ZqWVEJDnpLrE7IoC',
       },
     ],
     'condition': 'checkout_chromeos and checkout_src_internal',

ash/quick_pair/repository/fake_fast_pair_repository.cc

@@ -25,6 +25,11 @@ void FakeFastPairRepository::ClearFakeMetadata(
   data_.erase(base::ToUpperASCII(hex_model_id));
 }
 
+void FakeFastPairRepository::SetCheckAccountKeysResult(
+    absl::optional<PairingMetadata> result) {
+  check_account_key_result_ = result;
+}
+
 void FakeFastPairRepository::GetDeviceMetadata(
     const std::string& hex_model_id,
     DeviceMetadataCallback callback) {
@@ -46,7 +51,7 @@ void FakeFastPairRepository::IsValidModelId(
 void FakeFastPairRepository::CheckAccountKeys(
     const AccountKeyFilter& account_key_filter,
     CheckAccountKeysCallback callback) {
-  std::move(callback).Run(absl::nullopt);
+  std::move(callback).Run(check_account_key_result_);
 }
 
 void FakeFastPairRepository::AssociateAccountKey(

ash/quick_pair/repository/fake_fast_pair_repository.h

@@ -35,6 +35,8 @@ class FakeFastPairRepository : public FastPairRepository {
 
   void ClearFakeMetadata(const std::string& hex_model_id);
 
+  void SetCheckAccountKeysResult(absl::optional<PairingMetadata> result);
+
   // FastPairRepository::
   void GetDeviceMetadata(const std::string& hex_model_id,
                          DeviceMetadataCallback callback) override;
@@ -50,6 +52,7 @@ class FakeFastPairRepository : public FastPairRepository {
   static void SetInstance(FastPairRepository* instance);
 
   base::flat_map<std::string, std::unique_ptr<DeviceMetadata>> data_;
+  absl::optional<PairingMetadata> check_account_key_result_;
   base::WeakPtrFactory<FakeFastPairRepository> weak_ptr_factory_{this};
 };
 

ash/quick_pair/repository/fast_pair/pairing_metadata.cc

@@ -7,10 +7,12 @@
 namespace ash {
 namespace quick_pair {
 
-PairingMetadata::PairingMetadata(const DeviceMetadata* device_metadata,
-                                 const std::vector<uint8_t> account_key)
+PairingMetadata::PairingMetadata(DeviceMetadata* device_metadata,
+                                 std::vector<uint8_t> account_key)
     : device_metadata(device_metadata), account_key(std::move(account_key)) {}
 
+PairingMetadata::PairingMetadata(const PairingMetadata&) = default;
+PairingMetadata& PairingMetadata::operator=(const PairingMetadata&) = default;
 PairingMetadata::PairingMetadata(PairingMetadata&&) = default;
 PairingMetadata::~PairingMetadata() = default;
 

ash/quick_pair/repository/fast_pair/pairing_metadata.h

@@ -17,14 +17,15 @@ struct DeviceMetadata;
 // Thin wrapper around Account Key + decoded metadata for a Fast Pair device
 // which has already been paired.
 struct COMPONENT_EXPORT(QUICK_PAIR_REPOSITORY) PairingMetadata {
-  explicit PairingMetadata(const DeviceMetadata* device_metadata,
-                           const std::vector<uint8_t> account_key);
-  PairingMetadata(const PairingMetadata&) = delete;
+  explicit PairingMetadata(DeviceMetadata* device_metadata,
+                           std::vector<uint8_t> account_key);
+  PairingMetadata(const PairingMetadata&);
+  PairingMetadata& operator=(const PairingMetadata&);
   PairingMetadata(PairingMetadata&&);
   ~PairingMetadata();
 
-  const DeviceMetadata* device_metadata;
-  const std::vector<uint8_t> account_key;
+  DeviceMetadata* device_metadata;
+  std::vector<uint8_t> account_key;
 };
 
 }  // namespace quick_pair

ash/quick_pair/repository/fast_pair_repository_impl.cc

@@ -157,6 +157,7 @@ void FastPairRepositoryImpl::CompleteAccountKeyLookup(
     DeviceMetadata* device_metadata) {
   if (!device_metadata) {
     std::move(callback).Run(absl::nullopt);
+    return;
   }
   std::move(callback).Run(
       PairingMetadata(device_metadata, std::move(account_key)));

build/fuchsia/linux.sdk.sha1

@@ -1 +1 @@
-6.20210925.2.1
+6.20210926.0.1

build/fuchsia/mac.sdk.sha1

@@ -1 +1 @@
-6.20210925.3.1
+6.20210926.0.1

chrome/browser/apps/app_service/browser_app_instance_registry.cc

@@ -280,8 +280,9 @@ void BrowserAppInstanceRegistry::LacrosAppInstanceAdded(
     apps::BrowserAppInstanceUpdate update,
     aura::Window* window) {
   DCHECK(window);
+  auto id = update.id;
   auto& instance = AddInstance(
-      lacros_app_instances_, update.id,
+      lacros_app_instances_, id,
       std::make_unique<BrowserAppInstance>(std::move(update), window));
   for (auto& observer : observers_) {
     observer.OnBrowserAppAdded(instance);

chrome/browser/ash/app_restore/full_restore_app_launch_handler_browsertest.cc

@@ -126,6 +126,15 @@ void RemoveInactiveDesks() {
   }
 }
 
+// Gets the ARC app launch information from the full restore file for `app_id`
+// and `session_id`.
+std::unique_ptr<::app_restore::AppLaunchInfo> GetArcAppLaunchInfo(
+    const std::string& app_id,
+    int32_t session_id) {
+  return ::full_restore::FullRestoreReadHandler::GetInstance()
+      ->GetArcAppLaunchInfo(app_id, session_id);
+}
+
 class TestFullRestoreInfoObserver
     : public ::full_restore::FullRestoreInfo::Observer {
  public:
@@ -1279,8 +1288,7 @@ class FullRestoreAppLaunchHandlerArcAppBrowserTest
   void VerifyGetArcAppLaunchInfo(const std::string& app_id,
                                  int32_t session_id,
                                  int32_t restore_window_id) {
-    auto app_launch_info =
-        ::full_restore::GetArcAppLaunchInfo(app_id, session_id);
+    auto app_launch_info = GetArcAppLaunchInfo(app_id, session_id);
     ASSERT_TRUE(app_launch_info);
 
     EXPECT_EQ(app_id, app_launch_info->app_id);
@@ -1680,7 +1688,7 @@ IN_PROC_BROWSER_TEST_F(FullRestoreAppLaunchHandlerArcAppBrowserTest,
   VerifyWindowInfo(window, kActivationIndex);
 
   // Verify the ghost window session id has been removed from the restore data.
-  EXPECT_FALSE(::full_restore::GetArcAppLaunchInfo(app_id, session_id2));
+  EXPECT_FALSE(GetArcAppLaunchInfo(app_id, session_id2));
 
   // Destroy the task and close the window.
   app_host()->OnTaskDestroyed(kTaskId2);
@@ -1786,7 +1794,7 @@ IN_PROC_BROWSER_TEST_F(FullRestoreAppLaunchHandlerArcAppBrowserTest,
   VerifyWindowInfo(window, kActivationIndex);
 
   // Verify the ghost window session id has been removed from the restore data.
-  EXPECT_FALSE(::full_restore::GetArcAppLaunchInfo(app_id, session_id3));
+  EXPECT_FALSE(GetArcAppLaunchInfo(app_id, session_id3));
 
   // Destroy the task and close the window.
   app_host()->OnTaskDestroyed(kTaskId2);