Convert NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED to CallbackList

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 <algorithm>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 754 matching lines @@
     return;
 
   if (!service_.get()) {
     service_ = WebDataService::FromBrowserContext(profile_);
   }
 
   if (service_.get()) {
     load_handle_ = service_->GetKeywords(this);
   } else {
     ChangeToLoadedState();
-    NotifyLoaded();
+    on_loaded_callbacks_.Notify();
   }
 }
 
+scoped_ptr<TemplateURLService::Subscription>
+    TemplateURLService::RegisterOnLoadedCallback(
+        const base::Closure& callback) {
+  return loaded_ ?
+      scoped_ptr<TemplateURLService::Subscription>() :
+      on_loaded_callbacks_.Add(callback);
+}
+
 void TemplateURLService::OnWebDataServiceRequestDone(
     WebDataService::Handle h,
     const WDTypedResult* result) {
   // Reset the load_handle so that we don't try and cancel the load in
   // the destructor.
   load_handle_ = 0;
 
   if (!result) {
     // Results are null if the database went away or (most likely) wasn't
     // loaded.
     load_failed_ = true;
     ChangeToLoadedState();
-    NotifyLoaded();
+    on_loaded_callbacks_.Notify();
     return;
   }
 
   // initial_default_search_provider_ is only needed before we've finished
   // loading. Now that we've loaded we can nuke it.
   initial_default_search_provider_.reset();
 
   TemplateURLVector template_urls;
   TemplateURL* default_search_provider = NULL;
   int new_resource_keyword_version = 0;
@@ skipping 11 matching lines @@
   for (size_t i = 0; i < visits_to_add_.size(); ++i)
     UpdateKeywordSearchTermsForURL(visits_to_add_[i]);
   visits_to_add_.clear();
 
   if (new_resource_keyword_version)
     service_->SetBuiltinKeywordVersion(new_resource_keyword_version);
 
   EnsureDefaultSearchProviderExists();
 
   NotifyObservers();
-  NotifyLoaded();
+  on_loaded_callbacks_.Notify();
 }
 
 string16 TemplateURLService::GetKeywordShortName(const string16& keyword,
                                                  bool* is_extension_keyword) {
   const TemplateURL* template_url = GetTemplateURLForKeyword(keyword);
 
   // TODO(sky): Once LocationBarView adds a listener to the TemplateURLService
   // to track changes to the model, this should become a DCHECK.
   if (template_url) {
     *is_extension_keyword = template_url->IsExtensionKeyword();
@@ skipping 729 matching lines @@
 }
 
 void TemplateURLService::ChangeToLoadedState() {
   DCHECK(!loaded_);
 
   UIThreadSearchTermsData search_terms_data(profile_);
   provider_map_->Init(template_urls_, search_terms_data);
   loaded_ = true;
 }
 
-void TemplateURLService::NotifyLoaded() {
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
-      content::Source<TemplateURLService>(this),
-      content::NotificationService::NoDetails());
-}
-
 void TemplateURLService::SaveDefaultSearchProviderToPrefs(
     const TemplateURL* t_url) {
   PrefService* prefs = GetPrefs();
   if (!prefs)
     return;
 
   bool enabled = false;
   std::string search_url;
   std::string suggest_url;
   std::string instant_url;
@@ skipping 1042 matching lines @@
     const ExtensionKeyword& extension_keyword) const {
   TemplateURLData data;
   data.short_name = UTF8ToUTF16(extension_keyword.extension_name);
   data.SetKeyword(UTF8ToUTF16(extension_keyword.extension_keyword));
   // This URL is not actually used for navigation. It holds the extension's
   // ID, as well as forcing the TemplateURL to be treated as a search keyword.
   data.SetURL(std::string(extensions::kExtensionScheme) + "://" +
       extension_keyword.extension_id + "/?q={searchTerms}");
   return new TemplateURL(profile_, data);
 }