Convert NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED to CallbackList

chrome/browser/search_engines/template_url_fetcher.cc

Index: chrome/browser/search_engines/template_url_fetcher.cc
diff --git a/chrome/browser/search_engines/template_url_fetcher.cc b/chrome/browser/search_engines/template_url_fetcher.cc
index b20e59eb1588b039336f8df8ff21e8c8cd4e85fa..9b7720183bba0279d2756f4372c2bfbf3c881e0e 100644
--- a/chrome/browser/search_engines/template_url_fetcher.cc
+++ b/chrome/browser/search_engines/template_url_fetcher.cc
@@ -8,16 +8,12 @@
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_fetcher_callbacks.h"
 #include "chrome/browser/search_engines/template_url_parser.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
-#include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
@@ -29,8 +25,7 @@
 
 // RequestDelegate ------------------------------------------------------------
 class TemplateURLFetcher::RequestDelegate
-    : public net::URLFetcherDelegate,
-      public content::NotificationObserver {
+    : public net::URLFetcherDelegate {

[Lei Zhang, 2013/10/08 00:25:20]

fits on the prev line

[Cait (Slow), 2013/10/08 15:09:32]

Done.

  public:
   // Takes ownership of |callbacks|.
   RequestDelegate(TemplateURLFetcher* fetcher,
@@ -41,11 +36,6 @@ class TemplateURLFetcher::RequestDelegate
                   TemplateURLFetcherCallbacks* callbacks,
                   ProviderType provider_type);
 
-  // content::NotificationObserver:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
-
   // net::URLFetcherDelegate:
   // If data contains a valid OSDD, a TemplateURL is created and added to
   // the TemplateURLService.
@@ -61,6 +51,7 @@ class TemplateURLFetcher::RequestDelegate
   ProviderType provider_type() const { return provider_type_; }
 
  private:
+  void OnLoaded();
   void AddSearchProvider();
 
   scoped_ptr<net::URLFetcher> url_fetcher_;
@@ -72,8 +63,7 @@ class TemplateURLFetcher::RequestDelegate
   const ProviderType provider_type_;
   scoped_ptr<TemplateURLFetcherCallbacks> callbacks_;
 
-  // Handles registering for our notifications.
-  content::NotificationRegistrar registrar_;
+  scoped_ptr<TemplateURLService::Subscription> template_url_subscription_;
 
   DISALLOW_COPY_AND_ASSIGN(RequestDelegate);
 };
@@ -100,9 +90,9 @@ TemplateURLFetcher::RequestDelegate::RequestDelegate(
 
   if (!model->loaded()) {
     // Start the model load and set-up waiting for it.
-    registrar_.Add(this,
-                   chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
-                   content::Source<TemplateURLService>(model));
+    template_url_subscription_ = model->RegisterOnLoadedCallback(
+        base::Bind(&TemplateURLFetcher::RequestDelegate::OnLoaded,
+                   base::Unretained(this)));
     model->Load();
   }
 
@@ -119,12 +109,8 @@ TemplateURLFetcher::RequestDelegate::RequestDelegate(
   url_fetcher_->Start();
 }
 
-void TemplateURLFetcher::RequestDelegate::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  DCHECK(type == chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED);
-
+void TemplateURLFetcher::RequestDelegate::OnLoaded() {
+  template_url_subscription_.reset();
   if (!template_url_.get())
     return;
   AddSearchProvider();