Move preferences registering to backend.

BUG=none
TEST=none


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

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

4 files changed, 3 insertions, 11 deletions

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 9b0db6e..4bc07cd 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -53,7 +53,6 @@
 #include "chrome/browser/tabs/pinned_tab_codec.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/translate/translate_prefs.h"
-#include "chrome/browser/ui/autologin_infobar_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
@@ -144,7 +143,6 @@ void RegisterUserPrefs(PrefService* user_prefs) {
   // User prefs
   AppsPromo::RegisterUserPrefs(user_prefs);
   AutofillManager::RegisterUserPrefs(user_prefs);
-  AutoLoginInfoBarDelegate::RegisterUserPrefs(user_prefs);
   SessionStartupPref::RegisterUserPrefs(user_prefs);
   BookmarkModel::RegisterUserPrefs(user_prefs);
   Browser::RegisterUserPrefs(user_prefs);
diff --git a/chrome/browser/sync/signin_manager.cc b/chrome/browser/sync/signin_manager.cc
index 6156351..1feb5fc 100644
--- a/chrome/browser/sync/signin_manager.cc
+++ b/chrome/browser/sync/signin_manager.cc
@@ -28,6 +28,9 @@ void SigninManager::RegisterUserPrefs(PrefService* user_prefs) {
   user_prefs->RegisterStringPref(prefs::kGoogleServicesUsername,
                                  "",
                                  PrefService::UNSYNCABLE_PREF);
+  user_prefs->RegisterBooleanPref(prefs::kAutologinEnabled,
+                                  true,
+                                  PrefService::UNSYNCABLE_PREF);
 }
 
 void SigninManager::Initialize(Profile* profile) {
diff --git a/chrome/browser/ui/autologin_infobar_delegate.cc b/chrome/browser/ui/autologin_infobar_delegate.cc
index 9aaa66c..737fcec 100644
--- a/chrome/browser/ui/autologin_infobar_delegate.cc
+++ b/chrome/browser/ui/autologin_infobar_delegate.cc
@@ -134,12 +134,6 @@ void AutoLoginRedirector::RedirectToTokenAuth(const std::string& token) {
 }
 
 // static
-void AutoLoginInfoBarDelegate::RegisterUserPrefs(PrefService* user_prefs) {
-  user_prefs->RegisterBooleanPref(prefs::kAutologinEnabled, true,
-                                  PrefService::UNSYNCABLE_PREF);
-}
-
-// static
 void AutoLoginInfoBarDelegate::ShowIfAutoLoginRequested(
     net::URLRequest* request,
     int child_id,
diff --git a/chrome/browser/ui/autologin_infobar_delegate.h b/chrome/browser/ui/autologin_infobar_delegate.h
index 2f4de07..3fa589f 100644
--- a/chrome/browser/ui/autologin_infobar_delegate.h
+++ b/chrome/browser/ui/autologin_infobar_delegate.h
@@ -28,9 +28,6 @@ class AutoLoginInfoBarDelegate : public ConfirmInfoBarDelegate,
 
   virtual ~AutoLoginInfoBarDelegate();
 
-  // Register preferences used by auto-login feature.
-  static void RegisterUserPrefs(PrefService* user_prefs);
-
   // Looks for the X-Auto-Login response header in the request, and if found,
   // displays an infobar in the tab contents identified by the child/route id
   // if possible.