Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

chrome/browser/browser_process_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/browser_process_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 31 matching lines @@
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/metrics/thread_watcher.h"
 #include "chrome/browser/metrics/variations/variations_service.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/crl_set_fetcher.h"
 #include "chrome/browser/net/sdch_dictionary_fetcher.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "chrome/browser/policy/policy_service.h"
 #include "chrome/browser/prefs/browser_prefs.h"
-#include "chrome/browser/prefs/chrome_pref_service_builder.h"
+#include "chrome/browser/prefs/chrome_pref_service_factory.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prerender/prerender_tracker.h"
 #include "chrome/browser/printing/background_printing_manager.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/status_icons/status_tray.h"
@@ skipping 330 matching lines @@
   return watchdog_thread_.get();
 }
 
 ProfileManager* BrowserProcessImpl::profile_manager() {
   DCHECK(CalledOnValidThread());
   if (!created_profile_manager_)
     CreateProfileManager();
   return profile_manager_.get();
 }
 
-PrefService* BrowserProcessImpl::local_state() {
+PrefServiceSimple* BrowserProcessImpl::local_state() {

[Mattias Nissler (ping if slow), 2012/12/19 19:50:22]

Is there any reason why we can't return PrefServiceBase* here? Whoever calls
browser_process->local_state() should never register prefs ad hoc on the
returned PrefService. Returning PrefServiceBase here would allow us to enforce
that.

[Jói, 2012/12/20 16:30:31]

I think we could do that, have added a TODO to switch to that.

One question though; do you mean PrefServiceBase or just PrefService?  I think a
while back we were saying the PrefServiceBase interface would go away once we
finish all this refactoring work.

[Mattias Nissler (ping if slow), 2012/12/21 13:09:31]

I guess I got confused by naming and which is living where. I meant: The
PrefService type that will eventually live in base/prefs and provides all the
standard PrefService APIs for reading and writing values (but not pref
registration) :)

   DCHECK(CalledOnValidThread());
   if (!created_local_state_)
     CreateLocalState();
   return local_state_.get();
 }
 
 net::URLRequestContextGetter* BrowserProcessImpl::system_request_context() {
   DCHECK(CalledOnValidThread());
   return io_thread()->system_url_request_context_getter();
 }
@@ skipping 314 matching lines @@
   profile_manager_.reset(new ProfileManager(user_data_dir));
 }
 
 void BrowserProcessImpl::CreateLocalState() {
   DCHECK(!created_local_state_ && local_state_.get() == NULL);
   created_local_state_ = true;
 
   FilePath local_state_path;
   CHECK(PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path));
   local_state_.reset(
-      ChromePrefServiceBuilder().CreateChromePrefs(local_state_path,
-                                                   local_state_task_runner_,
-                                                   policy_service(),
-                                                   NULL, false));
+      ChromePrefServiceFactory().CreateLocalState(local_state_path,
+                                                  local_state_task_runner_,
+                                                  policy_service(),
+                                                  NULL, false));
 
   // Initialize the prefs of the local state.
   chrome::RegisterLocalState(local_state_.get());
 
   pref_change_registrar_.Init(local_state_.get());
 
   // Initialize the notification for the default browser setting policy.
   local_state_->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled,
                                     false);
   pref_change_registrar_.Add(
@@ skipping 224 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartBackgroundInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)