Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/chromeos/login/oauth2_login_manager.cc

 // Copyright (c) 2013 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/chromeos/login/oauth2_login_manager.h"
 
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "net/url_request/url_request_context_getter.h"
 
@@ skipping 62 matching lines @@
                    chrome::NOTIFICATION_TOKEN_LOADING_FINISHED,
                    content::Source<TokenService>(token_service));
     registrar_.Add(this,
                    chrome::NOTIFICATION_TOKEN_AVAILABLE,
                    content::Source<TokenService>(token_service));
   }
   return token_service;
 }
 
 void OAuth2LoginManager::RemoveLegacyTokens() {
-  PrefServiceSyncable* prefs = user_profile_->GetPrefs();
-  prefs->RegisterStringPref(prefs::kOAuth1Token,
-                            "",
-                            PrefServiceSyncable::UNSYNCABLE_PREF);
-  prefs->RegisterStringPref(prefs::kOAuth1Secret,
-                            "",
-                            PrefServiceSyncable::UNSYNCABLE_PREF);
+  PrefService* prefs = user_profile_->GetPrefs();
+  // TODO(joi): Registration should only be done up front.
+  scoped_refptr<PrefRegistrySyncable> registry(
+      static_cast<PrefRegistrySyncable*>(prefs->DeprecatedGetPrefRegistry()));
+  registry->RegisterStringPref(prefs::kOAuth1Token,
+                               "",
+                               PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterStringPref(prefs::kOAuth1Secret,
+                               "",
+                               PrefRegistrySyncable::UNSYNCABLE_PREF);
   prefs->ClearPref(prefs::kOAuth1Token);
   prefs->ClearPref(prefs::kOAuth1Secret);
-  prefs->UnregisterPreference(prefs::kOAuth1Token);
-  prefs->UnregisterPreference(prefs::kOAuth1Secret);
+  registry->DeprecatedUnregisterPreference(prefs::kOAuth1Token);
+  registry->DeprecatedUnregisterPreference(prefs::kOAuth1Secret);
 }
 
 void OAuth2LoginManager::StoreOAuth2Tokens(
     const GaiaAuthConsumer::ClientOAuthResult& oauth2_tokens) {
   TokenService* token_service = SetupTokenService();
   token_service->UpdateCredentialsWithOAuth2(oauth2_tokens);
 }
 
 void OAuth2LoginManager::LoadAndVerifyOAuth2Tokens() {
   // If we have no cookies, try to load saved OAuth2 token from TokenService.
@@ skipping 137 matching lines @@
 }
 
 void OAuth2LoginManager::StartTokenService(
     const GaiaAuthConsumer::ClientLoginResult& gaia_credentials) {
   TokenService* token_service = SetupTokenService();
   token_service->UpdateCredentials(gaia_credentials);
   CompleteAuthentication();
 }
 
 }  // namespace chromeos