Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome_frame/test/reliability/page_load_test.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.
 //
 // This file provides reliablity tests which run for ChromeFrame.
 //
 // Usage:
 // <reliability test exe> --list=file --startline=start --endline=end [...]
 // Upon invocation, it visits each of the URLs on line numbers between start
 // and end, inclusive, stored in the input file. The line number starts from 1.
@@ skipping 17 matching lines @@
 #include "base/file_version_info.h"
 #include "base/i18n/time_formatting.h"
 #include "base/path_service.h"
 #include "base/prefs/json_pref_store.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/test/test_file_util.h"
 #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"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
@@ skipping 373 matching lines @@
         num_dumps++;
       }
     }
     if (metrics)
       metrics->crash_dump_count = num_dumps;
   }
 
   // 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;
     builder.WithUserFilePrefs(
         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);
     metrics->browser_launch_count =
         local_state->GetInteger(prefs::kStabilityLaunchCount);
     metrics->page_load_count =
         local_state->GetInteger(prefs::kStabilityPageLoadCount);
     metrics->browser_crash_count =
         local_state->GetInteger(prefs::kStabilityCrashCount);
     metrics->renderer_crash_count =
@@ skipping 122 matching lines @@
             parsed_command_line.GetSwitchValuePath(switches::kJavaScriptFlags));
         if (v8_command_line.HasSwitch(kV8LogFileSwitch)) {
           g_v8_log_path = v8_command_line.GetSwitchValuePath(kV8LogFileSwitch);
           if (!file_util::AbsolutePath(&g_v8_log_path))
             g_v8_log_path = FilePath();
         }
       }
     }
   }
 }