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

services/preferences/public/cpp/pref_service_factory.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/pref_service_factory.h"
 
 #include "base/callback_helpers.h"
 #include "components/prefs/persistent_pref_store.h"
 #include "components/prefs/pref_notifier_impl.h"
 #include "components/prefs/pref_registry.h"
@@ skipping 77 matching lines @@
 void OnConnectError(
     scoped_refptr<RefCountedInterfacePtr<mojom::PrefStoreConnector>>
         connector_ptr,
     ConnectCallback callback) {
   callback.Run(nullptr);
   connector_ptr->reset();
 }
 
 }  // namespace
 
-void ConnectToPrefService(service_manager::Connector* connector,
-                          scoped_refptr<PrefRegistry> pref_registry,
-                          ConnectCallback callback,
-                          base::StringPiece service_name) {
+void ConnectToPrefService(
+    service_manager::Connector* connector,
+    scoped_refptr<PrefRegistry> pref_registry,
+    const std::vector<PrefValueStore::PrefStoreType>& already_connected_types,
+    ConnectCallback callback,
+    base::StringPiece service_name) {
   auto connector_ptr = make_scoped_refptr(
       new RefCountedInterfacePtr<mojom::PrefStoreConnector>());
   connector->BindInterface(service_name.as_string(), &connector_ptr->get());
   connector_ptr->get().set_connection_error_handler(base::Bind(
       &OnConnectError, connector_ptr, base::Passed(ConnectCallback{callback})));
   auto serialized_pref_registry = SerializePrefRegistry(*pref_registry);
   connector_ptr->get()->Connect(
-      std::move(serialized_pref_registry),
+      std::move(serialized_pref_registry), already_connected_types,
       base::Bind(&OnConnect, connector_ptr, base::Passed(&pref_registry),
                  base::Passed(&callback)));
 }
 
 }  // namespace prefs