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

chrome/browser/prefs/profile_pref_store_manager.cc

Index: chrome/browser/prefs/profile_pref_store_manager.cc
diff --git a/chrome/browser/prefs/profile_pref_store_manager.cc b/chrome/browser/prefs/profile_pref_store_manager.cc
index b1408398ecc9d271f0ec47b43c669083d79b0c81..5679f3efe3e1950bd15dc0e4c055edbfba72040d 100644
--- a/chrome/browser/prefs/profile_pref_store_manager.cc
+++ b/chrome/browser/prefs/profile_pref_store_manager.cc
@@ -15,6 +15,7 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/sequenced_task_runner.h"
 #include "build/build_config.h"
+#include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_features.h"
 #include "components/pref_registry/pref_registry_syncable.h"
@@ -117,8 +118,13 @@ PersistentPrefStore* ProfilePrefStoreManager::CreateProfilePrefStore(
     ConfigurePrefService(on_reset_on_load, connector);
     prefs::mojom::PrefStoreConnectorPtr pref_connector;
     connector->BindInterface(prefs::mojom::kServiceName, &pref_connector);
+    auto in_process_types_set = chrome::InProcessPrefStores();
+    std::vector<PrefValueStore::PrefStoreType> in_process_types;

[Sam McNally, 2017/04/03 10:09:31]

in_process_types(in_process_types_set.begin(), in_process_types_set.end());

[tibell, 2017/04/04 04:05:59]

Done.

+    std::copy(in_process_types_set.begin(), in_process_types_set.end(),
+              std::back_inserter(in_process_types));
     return new prefs::PersistentPrefStoreClient(std::move(pref_connector),
-                                                std::move(pref_registry));
+                                                std::move(pref_registry),
+                                                std::move(in_process_types));
   }
   if (!kPlatformSupportsPreferenceTracking) {
     return new JsonPrefStore(profile_path_.Append(chrome::kPreferencesFilename),