Pref service: have Mash and Chrome connect to the right pref stores

services/preferences/public/cpp/persistent_pref_store_client.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/preferences/public/cpp/persistent_pref_store_client.h"
 
 #include <utility>
 
 #include "base/values.h"
 #include "components/prefs/pref_registry.h"
 #include "mojo/public/cpp/bindings/sync_call_restrictions.h"
 #include "services/preferences/public/cpp/pref_registry_serializer.h"
 
 namespace prefs {
 
 PersistentPrefStoreClient::PersistentPrefStoreClient(
     mojom::PrefStoreConnectorPtr connector,
-    scoped_refptr<PrefRegistry> pref_registry)
+    scoped_refptr<PrefRegistry> pref_registry,
+    std::vector<PrefValueStore::PrefStoreType> already_connected_types)
     : connector_(std::move(connector)),
-      pref_registry_(std::move(pref_registry)) {
+      pref_registry_(std::move(pref_registry)),
+      already_connected_types_(std::move(already_connected_types)) {
   DCHECK(connector_);
 }
 
 PersistentPrefStoreClient::PersistentPrefStoreClient(
     mojom::PersistentPrefStoreConnectionPtr connection) {
   OnConnect(std::move(connection),
             std::unordered_map<PrefValueStore::PrefStoreType,
                                prefs::mojom::PrefStoreConnectionPtr>());
 }
 
@@ skipping 46 matching lines @@
     const {
   return read_error_;
 }
 
 PersistentPrefStore::PrefReadError PersistentPrefStoreClient::ReadPrefs() {
   mojom::PersistentPrefStoreConnectionPtr connection;
   std::unordered_map<PrefValueStore::PrefStoreType,
                      prefs::mojom::PrefStoreConnectionPtr>
       other_pref_stores;
   mojo::SyncCallRestrictions::ScopedAllowSyncCall allow_sync_calls;
-  if (!connector_->Connect(SerializePrefRegistry(*pref_registry_), &connection,
+  if (!connector_->Connect(SerializePrefRegistry(*pref_registry_),
+                           already_connected_types_, &connection,
                            &other_pref_stores)) {
     NOTREACHED();
   }
   pref_registry_ = nullptr;
   OnConnect(std::move(connection), std::move(other_pref_stores));
   return read_error_;
 }
 
 void PersistentPrefStoreClient::ReadPrefsAsync(
     ReadErrorDelegate* error_delegate) {
   error_delegate_.reset(error_delegate);
   connector_->Connect(SerializePrefRegistry(*pref_registry_),
+                      already_connected_types_,
                       base::Bind(&PersistentPrefStoreClient::OnConnect,
                                  base::Unretained(this)));
   pref_registry_ = nullptr;
 }
 
 void PersistentPrefStoreClient::CommitPendingWrite() {
   DCHECK(pref_store_);
   pref_store_->CommitPendingWrite();
 }
 
@@ skipping 29 matching lines @@
 
   if (connection->pref_store_connection) {
     Init(std::move(connection->pref_store_connection->initial_prefs), true,
          std::move(connection->pref_store_connection->observer));
   } else {
     Init(nullptr, false, nullptr);
   }
 }
 
 }  // namespace prefs