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

services/preferences/public/cpp/pref_service_factory.cc

Index: services/preferences/public/cpp/pref_service_factory.cc
diff --git a/services/preferences/public/cpp/pref_service_factory.cc b/services/preferences/public/cpp/pref_service_factory.cc
index d1a48c3d3794740eebcc6221a1f768feb5f6604d..58ff031c081643bbebd57ada904ee9ce11760a61 100644
--- a/services/preferences/public/cpp/pref_service_factory.cc
+++ b/services/preferences/public/cpp/pref_service_factory.cc
@@ -95,10 +95,12 @@ void OnConnectError(
 
 }  // 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());
@@ -106,7 +108,7 @@ void ConnectToPrefService(service_manager::Connector* connector,
       &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)));
 }