Not for check-in. Manually reviewable parts of https://codereview.chromium.org/11570009/

chrome/browser/signin/signin_manager_factory.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/browser/signin/signin_manager_factory.h"
 
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/token_service_factory.h"
@@ skipping 16 matching lines @@
 SigninManager* SigninManagerFactory::GetForProfileIfExists(Profile* profile) {
   return static_cast<SigninManager*>(
       GetInstance()->GetServiceForProfile(profile, false));
 }
 
 // static
 SigninManagerFactory* SigninManagerFactory::GetInstance() {
   return Singleton<SigninManagerFactory>::get();
 }
 
-void SigninManagerFactory::RegisterUserPrefs(PrefService* user_prefs) {
+void SigninManagerFactory::RegisterUserPrefs(PrefServiceSyncable* user_prefs) {
   user_prefs->RegisterStringPref(prefs::kGoogleServicesLastUsername, "",
-                                 PrefService::UNSYNCABLE_PREF);
+                                 PrefServiceSyncable::UNSYNCABLE_PREF);
   user_prefs->RegisterStringPref(prefs::kGoogleServicesUsername, "",
-                                 PrefService::UNSYNCABLE_PREF);
+                                 PrefServiceSyncable::UNSYNCABLE_PREF);
   user_prefs->RegisterBooleanPref(prefs::kAutologinEnabled, true,
-                                  PrefService::UNSYNCABLE_PREF);
+                                  PrefServiceSyncable::UNSYNCABLE_PREF);
   user_prefs->RegisterBooleanPref(prefs::kReverseAutologinEnabled, true,
-                                  PrefService::UNSYNCABLE_PREF);
+                                  PrefServiceSyncable::UNSYNCABLE_PREF);
   user_prefs->RegisterListPref(prefs::kReverseAutologinRejectedEmailList,
-                               new ListValue, PrefService::UNSYNCABLE_PREF);
+                               new ListValue,
+                               PrefServiceSyncable::UNSYNCABLE_PREF);
   user_prefs->RegisterBooleanPref(prefs::kIsGooglePlusUser, false,
-                                 PrefService::UNSYNCABLE_PREF);
+                                 PrefServiceSyncable::UNSYNCABLE_PREF);
 }
 
 // static
-void SigninManagerFactory::RegisterPrefs(PrefService* local_state) {
-  local_state->RegisterStringPref(prefs::kGoogleServicesUsernamePattern, "",
-                                  PrefService::UNSYNCABLE_PREF);
+void SigninManagerFactory::RegisterPrefs(PrefServiceSimple* local_state) {
+  local_state->RegisterStringPref(prefs::kGoogleServicesUsernamePattern, "");
 }
 
 ProfileKeyedService* SigninManagerFactory::BuildServiceInstanceFor(
     Profile* profile) const {
   SigninManager* service = new SigninManager();
   service->Initialize(profile);
   return service;
 }