Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome_frame/test/net/fake_external_tab.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_frame/test/net/fake_external_tab.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <exdisp.h>
 #include <Winsock2.h>
@@ skipping 15 matching lines @@
 #include "base/system_monitor/system_monitor.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_handle.h"
 #include "chrome/app/chrome_main_delegate.h"
 #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"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/renderer_host/web_cache_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 463 matching lines @@
       JsonPrefStore::GetTaskRunnerForFile(local_state_path,
                                           BrowserThread::GetBlockingPool());
   browser_process_.reset(new FakeBrowserProcessImpl(local_state_task_runner,
                                                     *cmd));
   // BrowserProcessImpl's constructor should set g_browser_process.
   DCHECK(g_browser_process);
   g_browser_process->SetApplicationLocale("en-US");
 
   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() {
   FilePath profile_path(ProfileManager::GetDefaultProfileDir(user_data()));
   Profile* profile =
       g_browser_process->profile_manager()->GetProfile(profile_path);
 }
 
 void FakeExternalTab::Shutdown() {
   browser_process_.reset();
@@ skipping 427 matching lines @@
   // content::InitializeSandboxInfo(&sandbox_info);
   FakeMainDelegate delegate;
   content::ContentMain(
       reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)),
       &sandbox_info,
       &delegate);
 
   // Note:  In debug builds, we ExitProcess during PostDestroyThreads.
   return g_test_suite->test_result();
 }