Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

chrome/browser/browser_process_impl.cc

Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 0dd9fdbdc159623e8ff7762d67cc70ea0135fc9a..55a13c0df1d724f092f9127de4c4c4589aeeae68 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -49,7 +49,7 @@
 #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"
@@ -400,7 +400,7 @@ ProfileManager* BrowserProcessImpl::profile_manager() {
   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();
@@ -735,10 +735,10 @@ void BrowserProcessImpl::CreateLocalState() {
   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());