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

services/preferences/pref_service_factory_unittest.cc

 // Copyright (c) 2017 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 "services/preferences/public/cpp/pref_service_factory.h"
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/test/sequenced_worker_pool_owner.h"
@@ skipping 30 matching lines @@
                  service_manager::InterfaceRegistry* registry) override {
     registry->AddInterface<service_manager::mojom::ServiceFactory>(this);
     return true;
   }
 
   void CreateService(service_manager::mojom::ServiceRequest request,
                      const std::string& name) override {
     if (name == prefs::mojom::kServiceName) {
       pref_service_context_.reset(new service_manager::ServiceContext(
           CreatePrefService({PrefValueStore::COMMAND_LINE_STORE,
-                             PrefValueStore::RECOMMENDED_STORE},
+                             PrefValueStore::RECOMMENDED_STORE,
+                             PrefValueStore::DEFAULT_STORE},
                             worker_pool_),
           std::move(request)));
     }
   }
 
   void Create(const service_manager::Identity& remote_identity,
               service_manager::mojom::ServiceFactoryRequest request) override {
     service_factory_bindings_.AddBinding(this, std::move(request));
   }
 
@@ skipping 57 matching lines @@
   void WillDestroyCurrentMessageLoop() override { worker_pool_owner_.reset(); }
 
   // Create a fully initialized PrefService synchronously.
   std::unique_ptr<PrefService> Create() {
     std::unique_ptr<PrefService> pref_service;
     base::RunLoop run_loop;
     auto pref_registry = make_scoped_refptr(new PrefRegistrySimple());
     pref_registry->RegisterIntegerPref(kKey, kInitialValue);
     pref_registry->RegisterIntegerPref(kOtherKey, kInitialValue);
     ConnectToPrefService(connector(), pref_registry,
+                         std::vector<PrefValueStore::PrefStoreType>(),
                          base::Bind(&PrefServiceFactoryTest::OnCreate,
                                     run_loop.QuitClosure(), &pref_service));
     run_loop.Run();
     return pref_service;
   }
 
   // Wait until first update of the pref |key| in |pref_service| synchronously.
   void WaitForPrefChange(PrefService* pref_service, const std::string& key) {
     PrefChangeRegistrar registrar;
     registrar.Init(pref_service);
@@ skipping 114 matching lines @@
                                           base::MakeUnique<base::Value>(2), 0);
   WaitForPrefChange(pref_service.get(), kKey);
   EXPECT_EQ(2, pref_service->GetInteger(kKey));
 
   pref_service->SetInteger(kKey, 3);
   EXPECT_EQ(2, pref_service->GetInteger(kKey));
 }
 
 }  // namespace
 }  // namespace prefs