Clean up the bootstrapping code in chrome frame net tests. There were a number of prefs

being registered on a demand basis. Turns out that the helper function RegisterLocalState
in the browser namespace registers all the prefs we need.

BUG=none
TEST=chrome frame net tests should continue to run correctly.

Review URL: http://codereview.chromium.org/6674030

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

1 files changed, 1 insertions, 15 deletions

diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index b418bb0..a37c1f4 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -218,25 +218,11 @@ void FakeExternalTab::Initialize() {
   g_browser_process->SetApplicationLocale("en-US");
 
   RenderProcessHost::set_run_renderer_in_process(true);
-
-  // Must register prefs before calling into the profile code.
-  PrefService* local_state = browser_process_->local_state();
-  local_state->RegisterStringPref(prefs::kApplicationLocale, "");
-  local_state->RegisterBooleanPref(prefs::kMetricsReportingEnabled, false);
-  browser::RegisterLocalState(local_state);
+  browser::RegisterLocalState(browser_process_->local_state());
 
   FilePath profile_path(ProfileManager::GetDefaultProfileDir(user_data()));
   Profile* profile = g_browser_process->profile_manager()->GetProfile(
       profile_path, false);
-  PrefService* prefs = profile->GetPrefs();
-  DCHECK(prefs != NULL);
-  WebCacheManager::RegisterPrefs(prefs);
-  // Override some settings to avoid hitting some preferences that have not
-  // been registered.
-  prefs->SetBoolean(prefs::kPasswordManagerEnabled, false);
-  prefs->SetBoolean(prefs::kAlternateErrorPagesEnabled, false);
-  prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false);
-  prefs->Set(prefs::kProxy, *ProxyConfigDictionary::CreateDirect());
   // Create the child threads.
   g_browser_process->db_thread();
   g_browser_process->file_thread();