Move PrefStoreManagerImpl into //services/preferences.

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 99 matching lines @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/page_zoom.h"
 #include "extensions/features/features.h"
 #include "ppapi/features/features.h"
 #include "printing/features/features.h"
-#include "services/preferences/public/cpp/pref_store_manager_impl.h"
+#include "services/preferences/public/cpp/pref_service_main.h"
 #include "services/preferences/public/interfaces/preferences.mojom.h"
 #include "services/preferences/public/interfaces/tracked_preference_validation_delegate.mojom.h"
+#include "services/service_manager/public/cpp/service.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/locale_change_guard.h"
 #include "chrome/browser/chromeos/preferences.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "components/user_manager/user_manager.h"
 #endif
 
@@ skipping 923 matching lines @@
 net::URLRequestContextGetter*
 ProfileImpl::CreateMediaRequestContextForStoragePartition(
     const base::FilePath& partition_path,
     bool in_memory) {
   return io_data_
       .GetIsolatedMediaRequestContextGetter(partition_path, in_memory).get();
 }
 
 void ProfileImpl::RegisterInProcessServices(StaticServiceMap* services) {
   if (base::FeatureList::IsEnabled(features::kPrefService)) {
     content::ServiceInfo info;

[Mike Lerman, 2017/03/21 13:32:40]

You're iterating on this within the Profiles directory a lot...

Would it be worthwhile to create a method within services/preferences that
creates the content::ServiceInfo object, and then this method is just
responsible for inserting it into StaticServiceMap?

Or even just passing the StaticServiceMap into the services/preferences code,
and having it insert its own object?

[Sam McNally, 2017/03/21 23:10:51]

Unfortunately, those aren't viable options due to layering: //services can't
depend on content; ServiceInfo and StaticServiceMap are both provided by
content. We also need something to inject the blocking pool.

-    info.factory =
-        base::Bind([]() -> std::unique_ptr<service_manager::Service> {
-          return base::MakeUnique<prefs::PrefStoreManagerImpl>(
-              prefs::PrefStoreManagerImpl::PrefStoreTypes(),
-              content::BrowserThread::GetBlockingPool());
-        });
+    info.factory = base::Bind(
+        &prefs::CreatePrefService, std::set<PrefValueStore::PrefStoreType>(),
+        make_scoped_refptr(content::BrowserThread::GetBlockingPool()));
     services->insert(std::make_pair(prefs::mojom::kPrefStoreServiceName, info));
   }
 }
 
 bool ProfileImpl::IsSameProfile(Profile* profile) {
   if (profile == static_cast<Profile*>(this))
     return true;
   Profile* otr_profile = off_the_record_profile_.get();
   return otr_profile && profile == otr_profile;
 }
@@ skipping 240 matching lines @@
 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) {
   domain_reliability::DomainReliabilityService* service =
       domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
           GetForBrowserContext(this);
   if (!service)
     return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>();
 
   return service->CreateMonitor(
       BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
 }