Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/search_engines/template_url_service.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/search_engines/template_url_service.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 901 matching lines @@
     // Policy has been updated, so the default search prefs may be different.
     // Reload the default search provider from them.
     // TODO(pkasting): Rather than communicating via prefs, we should eventually
     // observe policy changes directly.
     UpdateDefaultSearch();
   } else if (type == chrome::NOTIFICATION_GOOGLE_URL_UPDATED) {
     if (loaded_) {
       GoogleBaseURLChanged(
           content::Details<GoogleURLTracker::UpdatedDetails>(details)->first);
     }
-  } else if (type == chrome::NOTIFICATION_PREF_CHANGED) {
-    // Listen for changes to the default search from Sync.
-    DCHECK_EQ(std::string(prefs::kSyncedDefaultSearchProviderGUID),
-              *content::Details<std::string>(details).ptr());
-    PrefService* prefs = GetPrefs();
-    TemplateURL* new_default_search = GetTemplateURLForGUID(
-        prefs->GetString(prefs::kSyncedDefaultSearchProviderGUID));
-    if (new_default_search && !is_default_search_managed_) {
-      if (new_default_search != GetDefaultSearchProvider()) {
-        AutoReset<DefaultSearchChangeOrigin> change_origin(
-            &dsp_change_origin_, DSP_CHANGE_SYNC_PREF);
-        SetDefaultSearchProvider(new_default_search);
-        pending_synced_default_search_ = false;
-      }
-    } else {
-      // If it's not there, or if default search is currently managed, set a
-      // flag to indicate that we waiting on the search engine entry to come
-      // in through Sync.
-      pending_synced_default_search_ = true;
-    }
-    UpdateDefaultSearch();
   } else {
     NOTREACHED();
   }
 }
 
+void TemplateURLService::OnPreferenceChanged(PrefServiceBase* service,
+                                             const std::string& pref_name) {
+  // Listen for changes to the default search from Sync.
+  DCHECK_EQ(prefs::kSyncedDefaultSearchProviderGUID, pref_name);
+  PrefService* prefs = GetPrefs();
+  TemplateURL* new_default_search = GetTemplateURLForGUID(
+      prefs->GetString(prefs::kSyncedDefaultSearchProviderGUID));
+  if (new_default_search && !is_default_search_managed_) {
+    if (new_default_search != GetDefaultSearchProvider()) {
+      AutoReset<DefaultSearchChangeOrigin> change_origin(
+          &dsp_change_origin_, DSP_CHANGE_SYNC_PREF);
+      SetDefaultSearchProvider(new_default_search);
+      pending_synced_default_search_ = false;
+    }
+  } else {
+    // If it's not there, or if default search is currently managed, set a
+    // flag to indicate that we waiting on the search engine entry to come
+    // in through Sync.
+    pending_synced_default_search_ = true;
+  }
+  UpdateDefaultSearch();
+}
+
 syncer::SyncDataList TemplateURLService::GetAllSyncData(
     syncer::ModelType type) const {
   DCHECK_EQ(syncer::SEARCH_ENGINES, type);
 
   syncer::SyncDataList current_data;
   for (TemplateURLVector::const_iterator iter = template_urls_.begin();
       iter != template_urls_.end(); ++iter) {
     // We don't sync extension keywords.
     // TODO(mpcomplete): If we allow editing extension keywords, then those
     // should be persisted to disk and synced.
@@ skipping 1585 matching lines @@
     // TODO(mpcomplete): If we allow editing extension keywords, then those
     // should be persisted to disk and synced.
     if (template_url->sync_guid().empty() &&
         !template_url->IsExtensionKeyword()) {
       template_url->data_.sync_guid = base::GenerateGUID();
       if (service_.get())
         service_->UpdateKeyword(template_url->data());
     }
   }
 }