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

chrome/browser/prefs/browser_prefs.cc

Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 12cac036daf174a70ca2192d983593675670029b..0f1ea5461b59fdeee11ec0a31478a30dffb992f1 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -791,4 +791,32 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
   }
 }
 
+std::set<PrefValueStore::PrefStoreType> ExpectedPrefStores() {
+  return std::set<PrefValueStore::PrefStoreType>({
+    PrefValueStore::MANAGED_STORE,

[Bernhard Bauer, 2017/04/03 10:37:39]

<sigh> I guess clang-format doesn't deal with initializer lists properly... 

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

Done.

+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+        PrefValueStore::SUPERVISED_USER_STORE,
+#endif
+#if BUILDFLAG(ENABLE_EXTENSIONS)
+        PrefValueStore::EXTENSION_STORE,
+#endif
+        PrefValueStore::COMMAND_LINE_STORE, PrefValueStore::RECOMMENDED_STORE,
+        PrefValueStore::DEFAULT_STORE

[Bernhard Bauer, 2017/04/03 10:37:40]

Why is the USER_STORE missing here?

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

It's always present, but I changed the code to allow it here for completeness
(the service itself ignores it if in the list).

+  });
+}
+
+std::set<PrefValueStore::PrefStoreType> InProcessPrefStores() {

[Bernhard Bauer, 2017/04/03 10:37:39]

I guess you could really implement this method in terms of ExpectedPrefStores()
and just remove the DEFAULT_STORE?

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

Done.

+  return std::set<PrefValueStore::PrefStoreType>({
+    PrefValueStore::MANAGED_STORE,
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+        PrefValueStore::SUPERVISED_USER_STORE,
+#endif
+#if BUILDFLAG(ENABLE_EXTENSIONS)
+        PrefValueStore::EXTENSION_STORE,
+#endif
+        PrefValueStore::COMMAND_LINE_STORE, PrefValueStore::USER_STORE,
+        PrefValueStore::RECOMMENDED_STORE,
+  });
+}
+
 }  // namespace chrome