Convert NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED to CallbackList

chrome/browser/search_engines/template_url_fetcher.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 "build/build_config.h"
 
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 
 #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"
 #include "content/public/common/url_fetcher.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_status.h"
 
 // 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,
                   const string16& keyword,
                   const GURL& osdd_url,
                   const GURL& favicon_url,
                   content::WebContents* web_contents,
                   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.
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   // URL of the OSDD.
   GURL url() const { return osdd_url_; }
 
   // Keyword to use.
   string16 keyword() const { return keyword_; }
 
   // The type of search provider being fetched.
   ProviderType provider_type() const { return provider_type_; }
 
  private:
+  void OnLoaded();
   void AddSearchProvider();
 
   scoped_ptr<net::URLFetcher> url_fetcher_;
   TemplateURLFetcher* fetcher_;
   scoped_ptr<TemplateURL> template_url_;
   string16 keyword_;
   const GURL osdd_url_;
   const GURL favicon_url_;
   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);
 };
 
 TemplateURLFetcher::RequestDelegate::RequestDelegate(
     TemplateURLFetcher* fetcher,
     const string16& keyword,
     const GURL& osdd_url,
     const GURL& favicon_url,
     content::WebContents* web_contents,
     TemplateURLFetcherCallbacks* callbacks,
     ProviderType provider_type)
     : url_fetcher_(net::URLFetcher::Create(
           osdd_url, net::URLFetcher::GET, this)),
       fetcher_(fetcher),
       keyword_(keyword),
       osdd_url_(osdd_url),
       favicon_url_(favicon_url),
       provider_type_(provider_type),
       callbacks_(callbacks) {
   TemplateURLService* model = TemplateURLServiceFactory::GetForProfile(
       fetcher_->profile());
   DCHECK(model);  // TemplateURLFetcher::ScheduleDownload verifies this.
 
   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();
   }
 
   url_fetcher_->SetRequestContext(fetcher->profile()->GetRequestContext());
   // Can be NULL during tests.
   if (web_contents) {
     content::AssociateURLFetcherWithRenderView(
         url_fetcher_.get(),
         web_contents->GetURL(),
         web_contents->GetRenderProcessHost()->GetID(),
         web_contents->GetRenderViewHost()->GetRoutingID());
   }
 
   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();
   // WARNING: AddSearchProvider deletes us.
 }
 
 void TemplateURLFetcher::RequestDelegate::OnURLFetchComplete(
     const net::URLFetcher* source) {
   // Validation checks.
   // Make sure we can still replace the keyword, i.e. the fetch was successful.
@@ skipping 150 matching lines @@
                           owned_callbacks.release(), provider_type));
 }
 
 void TemplateURLFetcher::RequestCompleted(RequestDelegate* request) {
   Requests::iterator i =
       std::find(requests_.begin(), requests_.end(), request);
   DCHECK(i != requests_.end());
   requests_.weak_erase(i);
   delete request;
 }