Convert NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED to CallbackList

chrome/browser/search_engines/template_url_service.cc

Index: chrome/browser/search_engines/template_url_service.cc
diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc
index 02f1551a1de9d01df86414c3e862cb2e62673f69..c82fe8141e4f8846ecd5a69c8b34dcf2a7b15421 100644
--- a/chrome/browser/search_engines/template_url_service.cc
+++ b/chrome/browser/search_engines/template_url_service.cc
@@ -782,6 +782,14 @@ void TemplateURLService::Load() {
   }
 }
 
+scoped_ptr<TemplateURLService::Subscription>
+TemplateURLService::RegisterOnLoadedCallback(

[Peter Kasting, 2013/10/02 22:22:04]

Nit: Indent 4

[Cait (Slow), 2013/10/03 15:36:45]

Done.

+    const base::Closure& callback) {
+  if (loaded_)

[Peter Kasting, 2013/10/02 22:22:04]

Nit: I very slightly prefer:

  return loaded_ ?
      scoped_ptr<TemplateURLService::Subscription>() :
      on_loaded_callbacks_.Add(callback);

[Cait (Slow), 2013/10/03 15:36:45]

Done.

+    return scoped_ptr<TemplateURLService::Subscription>();
+  return on_loaded_callbacks_.Add(callback);
+}
+
 void TemplateURLService::OnWebDataServiceRequestDone(
     WebDataService::Handle h,
     const WDTypedResult* result) {
@@ -1577,10 +1585,7 @@ void TemplateURLService::ChangeToLoadedState() {
 }
 
 void TemplateURLService::NotifyLoaded() {
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
-      content::Source<TemplateURLService>(this),
-      content::NotificationService::NoDetails());
+  on_loaded_callbacks_.Notify();

[Peter Kasting, 2013/10/02 22:22:04]

Nit: At this point, we can just nuke NotifyLoaded() and inline this line into
the callers directly.

[Cait (Slow), 2013/10/03 15:36:45]

Done.

 }
 
 void TemplateURLService::SaveDefaultSearchProviderToPrefs(