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

chrome/browser/prefs/browser_prefs.cc

 // Copyright 2012 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 "chrome/browser/prefs/browser_prefs.h"
 
 #include <string>
 
 #include "base/files/file_util.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 773 matching lines @@
     int rlz_ping_delay = 0;
     if (distro_dict &&
         distro_dict->GetInteger(kDistroRlzPingDelay, &rlz_ping_delay)) {
       profile_prefs->SetInteger(prefs::kRlzPingDelaySeconds, rlz_ping_delay);
     }
 #endif  // BUILDFLAG(ENABLE_RLZ)
     profile_prefs->ClearPref(kDistroDict);
   }
 }
 
+std::set<PrefValueStore::PrefStoreType> ExpectedPrefStores() {
+  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::RECOMMENDED_STORE,
+        PrefValueStore::DEFAULT_STORE
+  });
+}
+
+std::set<PrefValueStore::PrefStoreType> InProcessPrefStores() {
+  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,

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

Remove USER_STORE.

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

Done.

+        PrefValueStore::RECOMMENDED_STORE,
+  });
+}
+
 }  // namespace chrome