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

chrome/browser/profiles/profile_impl.cc

 // Copyright (c) 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/profiles/profile_impl.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 1051 matching lines @@
     const base::FilePath& partition_path,
     bool in_memory) {
   return io_data_
       .GetIsolatedMediaRequestContextGetter(partition_path, in_memory).get();
 }
 
 void ProfileImpl::RegisterInProcessServices(StaticServiceMap* services) {
   if (features::PrefServiceEnabled()) {
     content::ServiceInfo info;
     info.factory = base::Bind(
-        &prefs::CreatePrefService, std::set<PrefValueStore::PrefStoreType>(),
+        &prefs::CreatePrefService, chrome::ExpectedPrefStores(),
         make_scoped_refptr(content::BrowserThread::GetBlockingPool()));
     info.task_runner = content::BrowserThread::GetTaskRunnerForThread(
         content::BrowserThread::IO);
     services->insert(std::make_pair(prefs::mojom::kServiceName, info));
   }
 
   content::ServiceInfo identity_service_info;
 
   // The Identity Service must run on the UI thread.
   identity_service_info.task_runner = base::ThreadTaskRunnerHandle::Get();
@@ skipping 261 matching lines @@
     return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>();
 
   return service->CreateMonitor(
       BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
 }
 
 std::unique_ptr<service_manager::Service> ProfileImpl::CreateIdentityService() {
   SigninManagerBase* signin_manager = SigninManagerFactory::GetForProfile(this);
   return base::MakeUnique<identity::IdentityService>(signin_manager);
 }