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

chrome/browser/prefs/profile_pref_store_manager_unittest.cc

 // Copyright 2014 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/profile_pref_store_manager.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 135 matching lines @@
         seed_("seed"),
         reset_recorded_(false) {}
 
   void SetUp() override {
     worker_pool_ = base::MakeUnique<base::SequencedWorkerPoolOwner>(
         2, "ProfilePrefStoreManagerTest");
     if (GetParam()) {
       feature_list_.InitAndEnableFeature(features::kPrefService);
       service_manager::mojom::ServicePtr service_ptr;
       pref_service_context_ = base::MakeUnique<service_manager::ServiceContext>(
-          prefs::CreatePrefService(std::set<PrefValueStore::PrefStoreType>(),
-                                   worker_pool_->pool()),
+          prefs::CreatePrefService(
+              std::set<PrefValueStore::PrefStoreType>(
+                  {PrefValueStore::USER_STORE, PrefValueStore::DEFAULT_STORE}),
+              worker_pool_->pool()),
           mojo::MakeRequest(&service_ptr));
       connector_ = service_manager::Connector::Create(&connector_request_);
       service_manager::Connector::TestApi test_api(connector_.get());
       test_api.OverrideBinderForTesting(
           prefs::mojom::kServiceName, prefs::mojom::PrefStoreConnector::Name_,
           base::Bind(&ProfilePrefStoreManagerTest::BindInterface,
                      base::Unretained(this),
                      prefs::mojom::PrefStoreConnector::Name_));
       test_api.OverrideBinderForTesting(
           prefs::mojom::kServiceName, prefs::mojom::PrefServiceControl::Name_,
@@ skipping 53 matching lines @@
     return ProfilePrefStoreManager::kPlatformSupportsPreferenceTracking &&
            !GetParam();
   }
 
   void RelaunchPrefService() {
     if (!GetParam())
       return;
 
     service_manager::mojom::ServicePtr service_ptr;
     pref_service_context_ = base::MakeUnique<service_manager::ServiceContext>(
-        prefs::CreatePrefService(std::set<PrefValueStore::PrefStoreType>(),
-                                 worker_pool_->pool()),
+        prefs::CreatePrefService(
+            std::set<PrefValueStore::PrefStoreType>(
+                {PrefValueStore::USER_STORE, PrefValueStore::DEFAULT_STORE}),
+            worker_pool_->pool()),
         mojo::MakeRequest(&service_ptr));
   }
 
   // Verifies whether a reset was reported via the RecordReset() hook. Also
   // verifies that GetResetTime() was set (or not) accordingly.
   void VerifyResetRecorded(bool reset_expected) {
     EXPECT_EQ(reset_expected, reset_recorded_);
 
     PrefServiceFactory pref_service_factory;
     pref_service_factory.set_user_prefs(pref_store_);
@@ skipping 373 matching lines @@
                         base::WrapUnique(new base::Value(kGoodbyeWorld)),
                         WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   LoadExistingPrefs();
   ExpectStringValueEquals(kProtectedAtomic, kGoodbyeWorld);
   VerifyResetRecorded(false);
 }
 
 INSTANTIATE_TEST_CASE_P(ProfilePrefStoreManagerTest,
                         ProfilePrefStoreManagerTest,
                         testing::Bool());