Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

This is a step towards removing registration methods from PrefService and simplifying its class hierarchy.

TBR=ben@chromium.org
BUG=155525


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

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

2 files changed, 19 insertions, 10 deletions

diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 24007f2..4640508 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -33,6 +33,7 @@
 #include "chrome/browser/automation/automation_provider_list.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/prefs/browser_prefs.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
 #include "chrome/browser/process_singleton.h"
@@ -516,8 +517,13 @@ void FakeExternalTab::Initialize() {
 
   content::RenderProcessHost::SetRunRendererInProcess(true);
 
-  browser_process_->local_state()->RegisterBooleanPref(
-      prefs::kMetricsReportingEnabled, false);
+  // TODO(joi): Registration should be done up front via browser_prefs.cc
+  scoped_refptr<PrefRegistrySimple> registry = static_cast<PrefRegistrySimple*>(
+      browser_process_->local_state()->DeprecatedGetPrefRegistry());
+  if (!browser_process_->local_state()->FindPreference(
+          prefs::kMetricsReportingEnabled)) {
+    registry->RegisterBooleanPref(prefs::kMetricsReportingEnabled, false);
+  }
 }
 
 void FakeExternalTab::InitializePostThreadsCreated() {
diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc
index 1a6b781..3b85697 100644
--- a/chrome_frame/test/reliability/page_load_test.cc
+++ b/chrome_frame/test/reliability/page_load_test.cc
@@ -35,6 +35,7 @@
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/net/url_fixer_upper.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_service_mock_builder.h"
 #include "chrome/browser/prefs/pref_value_store.h"
@@ -428,7 +429,7 @@ 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.
-  PrefServiceSimple* GetLocalState() {
+  PrefService* GetLocalState(PrefRegistry* registry) {
     FilePath path;
     chrome::GetChromeFrameUserDataDirectory(&path);
     PrefServiceMockBuilder builder;
@@ -436,20 +437,22 @@ class PageLoadTest : public testing::Test {
         path,
         JsonPrefStore::GetTaskRunnerForFile(
             path, content::BrowserThread::GetBlockingPool()));
-    return builder.CreateSimple();
+    return builder.Create(registry);
   }
 
   void GetStabilityMetrics(NavigationMetrics* metrics) {
     if (!metrics)
       return;
-    scoped_ptr<PrefServiceSimple> local_state(GetLocalState());
+    scoped_refptr<PrefRegistrySimple> registry = new PrefRegistrySimple();
+    registry->RegisterBooleanPref(prefs::kStabilityExitedCleanly, false);
+    registry->RegisterIntegerPref(prefs::kStabilityLaunchCount, -1);
+    registry->RegisterIntegerPref(prefs::kStabilityPageLoadCount, -1);
+    registry->RegisterIntegerPref(prefs::kStabilityCrashCount, 0);
+    registry->RegisterIntegerPref(prefs::kStabilityRendererCrashCount, 0);
+
+    scoped_ptr<PrefService> local_state(GetLocalState(registry));
     if (!local_state.get())
       return;
-    local_state->RegisterBooleanPref(prefs::kStabilityExitedCleanly, false);
-    local_state->RegisterIntegerPref(prefs::kStabilityLaunchCount, -1);
-    local_state->RegisterIntegerPref(prefs::kStabilityPageLoadCount, -1);
-    local_state->RegisterIntegerPref(prefs::kStabilityCrashCount, 0);
-    local_state->RegisterIntegerPref(prefs::kStabilityRendererCrashCount, 0);
 
     metrics->browser_clean_exit =
         local_state->GetBoolean(prefs::kStabilityExitedCleanly);