3 files changed, 4 insertions, 10 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 1c0edfb4..33bf95b 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -377,14 +377,6 @@ IOThread::IOThread(
 #if !defined(OS_IOS) && !defined(OS_ANDROID)
   net::ProxyResolverV8::RememberDefaultIsolate();
 #endif
-  // We call RegisterPrefs() here (instead of inside browser_prefs.cc) to make
-  // sure that everything is initialized in the right order.
-  //
-  // TODO(joi): See if we can fix so it does get registered from
-  // browser_prefs::RegisterLocalState.
-  PrefRegistrySimple* registry = static_cast<PrefRegistrySimple*>(
-      local_state->DeprecatedGetPrefRegistry());
-  RegisterPrefs(registry);
   auth_schemes_ = local_state->GetString(prefs::kAuthSchemes);
   negotiate_disable_cname_lookup_ = local_state->GetBoolean(
       prefs::kDisableAuthNegotiateCnameLookup);
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index a70c99e..a1f1c14 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -178,6 +178,8 @@ class IOThread : public content::BrowserThreadDelegate {
 
   virtual ~IOThread();
 
+  static void RegisterPrefs(PrefRegistrySimple* registry);
+
   // Can only be called on the IO thread.
   Globals* globals();
 
@@ -236,8 +238,6 @@ class IOThread : public content::BrowserThreadDelegate {
   // SystemRequestContext state has been initialized on the UI thread.
   void InitSystemRequestContextOnIOThread();
 
-  static void RegisterPrefs(PrefRegistrySimple* registry);
-
   net::HttpAuthHandlerFactory* CreateDefaultAuthHandlerFactory(
       net::HostResolver* resolver);
 
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index af73e99..da61015 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -34,6 +34,7 @@
 #include "chrome/browser/google/google_url_tracker_factory.h"
 #include "chrome/browser/gpu/gl_string_manager.h"
 #include "chrome/browser/intranet_redirect_detector.h"
+#include "chrome/browser/io_thread.h"
 #include "chrome/browser/managed_mode/managed_mode.h"
 #include "chrome/browser/managed_mode/managed_user_service.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
@@ -176,6 +177,7 @@ void RegisterLocalState(PrefService* local_state,
   geolocation::RegisterPrefs(registry);
   GLStringManager::RegisterPrefs(registry);
   IntranetRedirectDetector::RegisterPrefs(registry);
+  IOThread::RegisterPrefs(registry);
   KeywordEditorController::RegisterPrefs(registry);
   MetricsLog::RegisterPrefs(registry);
   MetricsService::RegisterPrefs(registry);