Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

The first two (PrefServiceSimple is a subclass of PrefService) know
nothing about sync or any Chrome or content concepts.

The third (PrefServiceSyncable, a separate subclass of PrefService)
knows about sync and requires users to choose whether each individual
preference is syncable or not when it is registered.

BrowserProcess::local_state() is a PrefServiceSimple after this
change, and Profile::prefs() is a PrefServiceSyncable.

COLLABORATOR=kaiwang@chromium.org
TBR=ben@chromium.org
BUG=155525


Review URL: https://chromiumcodereview.appspot.com/11570009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174531 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 4 deletions

diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc
index 478ce54..1a6b781 100644
--- a/chrome_frame/test/reliability/page_load_test.cc
+++ b/chrome_frame/test/reliability/page_load_test.cc
@@ -428,19 +428,21 @@ class PageLoadTest : public testing::Test {
   // Get a PrefService whose contents correspond to the Local State file
   // that was saved by the app as it closed.  The caller takes ownership of the
   // returned PrefService object.
-  PrefService* GetLocalState() {
+  PrefServiceSimple* GetLocalState() {
     FilePath path;
     chrome::GetChromeFrameUserDataDirectory(&path);
-    return PrefServiceMockBuilder().WithUserFilePrefs(
+    PrefServiceMockBuilder builder;
+    builder.WithUserFilePrefs(
         path,
         JsonPrefStore::GetTaskRunnerForFile(
-            path, content::BrowserThread::GetBlockingPool())).Create();
+            path, content::BrowserThread::GetBlockingPool()));
+    return builder.CreateSimple();
   }
 
   void GetStabilityMetrics(NavigationMetrics* metrics) {
     if (!metrics)
       return;
-    scoped_ptr<PrefService> local_state(GetLocalState());
+    scoped_ptr<PrefServiceSimple> local_state(GetLocalState());
     if (!local_state.get())
       return;
     local_state->RegisterBooleanPref(prefs::kStabilityExitedCleanly, false);