Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/sync/credential_cache_service_win.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/sync/credential_cache_service_win.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 76 matching lines @@
   alternate_store_.release();
 }
 
 void CredentialCacheService::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(local_store_.get());
   switch (type) {
-    case chrome::NOTIFICATION_PREF_CHANGED: {
-      // One of the two sync encryption tokens has changed. Update its value in
-      // the local cache.
-      const std::string pref_name =
-          *(content::Details<const std::string>(details).ptr());
-      if (pref_name == prefs::kSyncEncryptionBootstrapToken) {
-        PackAndUpdateStringPref(pref_name,
-                                sync_prefs_.GetEncryptionBootstrapToken());
-      } else if (pref_name == prefs::kSyncKeystoreEncryptionBootstrapToken) {
-        PackAndUpdateStringPref(
-            pref_name,
-            sync_prefs_.GetKeystoreEncryptionBootstrapToken());
-      } else {
-        NOTREACHED() "Invalid pref name " << pref_name << ".";
-      }
-      break;
-    }
-
     case chrome::NOTIFICATION_GOOGLE_SIGNED_OUT: {
       // The user has signed out. Write blank values to the google username,
       // encryption tokens and token service credentials in the local cache.
       PackAndUpdateStringPref(prefs::kGoogleServicesUsername, std::string());
       if (HasPref(local_store_, prefs::kSyncEncryptionBootstrapToken)) {
         PackAndUpdateStringPref(prefs::kSyncEncryptionBootstrapToken,
                                 std::string());
       }
       if (HasPref(local_store_, prefs::kSyncKeystoreEncryptionBootstrapToken)) {
         PackAndUpdateStringPref(prefs::kSyncKeystoreEncryptionBootstrapToken,
@@ skipping 61 matching lines @@
       break;
     }
 
     default: {
       NOTREACHED();
       break;
     }
   }
 }
 
+void CredentialCacheService::OnPreferenceChanged(PrefServiceBase* service,
+                                                 const std::string& pref_name) {
+  // One of the two sync encryption tokens has changed. Update its value in
+  // the local cache.
+  if (pref_name == prefs::kSyncEncryptionBootstrapToken) {
+    PackAndUpdateStringPref(pref_name,
+                            sync_prefs_.GetEncryptionBootstrapToken());
+  } else if (pref_name == prefs::kSyncKeystoreEncryptionBootstrapToken) {
+    PackAndUpdateStringPref(
+        pref_name,
+        sync_prefs_.GetKeystoreEncryptionBootstrapToken());
+  } else {
+    NOTREACHED() "Invalid pref name " << pref_name << ".";
+  }
+}
+
 void CredentialCacheService::ReadCachedCredentialsFromAlternateProfile() {
   // If the local user has signed in and signed out, we do not consume cached
   // credentials from the alternate profile. There is nothing more to do, now or
   // later on.
   if (HasUserSignedOut())
     return;
 
   // Sanity check the alternate credential cache. Note that it is sufficient to
   // have just one of the two sync encryption tokens. If any string credentials
   // are outright missing even though the file exists, something is awry with
@@ skipping 663 matching lines @@
          !HasUserSignedOut() &&
          !alternate_google_services_username.empty() &&
          !alternate_lsid.empty() &&
          !alternate_sid.empty() &&
          !(alternate_encryption_bootstrap_token.empty() &&
            alternate_keystore_encryption_bootstrap_token.empty()) &&
          !service->setup_in_progress();
 }
 
 }  // namespace syncer