Convert NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED to CallbackList

chrome/browser/importer/external_process_importer_host.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/importer/external_process_importer_host.h"
 
 #include "base/bind.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/importer/external_process_importer_client.h"
 #include "chrome/browser/importer/firefox_profile_lock.h"
 #include "chrome/browser/importer/importer_lock_dialog.h"
 #include "chrome/browser/importer/importer_progress_observer.h"
 #include "chrome/browser/importer/in_process_importer_bridge.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/notification_source.h"
 
 using content::BrowserThread;
 
 ExternalProcessImporterHost::ExternalProcessImporterHost()
-    : weak_ptr_factory_(this),
-      headless_(false),
+    : headless_(false),
       parent_window_(NULL),
       observer_(NULL),
       profile_(NULL),
       waiting_for_bookmarkbar_model_(false),
       installed_bookmark_observer_(false),
       is_source_readable_(true),
       client_(NULL),
       items_(0),
       cancelled_(false),
-      import_process_launched_(false) {
+      import_process_launched_(false),
+      weak_ptr_factory_(this) {
 }
 
 void ExternalProcessImporterHost::Cancel() {
   cancelled_ = true;
   if (import_process_launched_)
     client_->Cancel();
   NotifyImportEnded();  // Tells the observer that we're done, and deletes us.
 }
 
 void ExternalProcessImporterHost::StartImportSettings(
@@ skipping 46 matching lines @@
 }
 
 ExternalProcessImporterHost::~ExternalProcessImporterHost() {
   if (installed_bookmark_observer_) {
     DCHECK(profile_);
     BookmarkModelFactory::GetForProfile(profile_)->RemoveObserver(this);
   }
 }
 
 void ExternalProcessImporterHost::LaunchImportIfReady() {
-  if (waiting_for_bookmarkbar_model_ || !registrar_.IsEmpty() ||
+  if (waiting_for_bookmarkbar_model_ || template_service_subscription_.get() ||
       !is_source_readable_ || cancelled_)
     return;
 
   // This is the in-process half of the bridge, which catches data from the IPC
   // pipe and feeds it to the ProfileWriter. The external process half of the
   // bridge lives in the external process (see ProfileImportThread).
   // The ExternalProcessImporterClient created in the next line owns the bridge,
   // and will delete it.
   InProcessImporterBridge* bridge =
       new InProcessImporterBridge(writer_.get(),
@@ skipping 15 matching lines @@
 }
 
 void ExternalProcessImporterHost::BookmarkModelBeingDeleted(
     BookmarkModel* model) {
   installed_bookmark_observer_ = false;
 }
 
 void ExternalProcessImporterHost::BookmarkModelChanged() {
 }
 
-void ExternalProcessImporterHost::Observe(int type,
-                           const content::NotificationSource& source,
-                           const content::NotificationDetails& details) {
-  DCHECK_EQ(type, chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED);
-  registrar_.RemoveAll();
+void ExternalProcessImporterHost::OnTemplateURLServiceLoaded() {
+  template_service_subscription_.reset();
   LaunchImportIfReady();
 }
 
 void ExternalProcessImporterHost::ShowWarningDialog() {
   DCHECK(!headless_);
   importer::ShowImportLockDialog(
       parent_window_,
       base::Bind(&ExternalProcessImporterHost::OnImportLockDialogEnd,
                  weak_ptr_factory_.GetWeakPtr()));
 }
@@ skipping 48 matching lines @@
     installed_bookmark_observer_ = true;
   }
 
   // Observes the TemplateURLService if needed to import search engines from the
   // other browser. We also check to see if we're importing bookmarks because
   // we can import bookmark keywords from Firefox as search engines.
   if ((items & importer::SEARCH_ENGINES) || (items & importer::FAVORITES)) {
     if (!writer_->TemplateURLServiceIsLoaded()) {
       TemplateURLService* model =
           TemplateURLServiceFactory::GetForProfile(profile_);
-      registrar_.Add(this, chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
-                     content::Source<TemplateURLService>(model));
+      template_service_subscription_ = model->RegisterOnLoadedCallback(
+          base::Bind(&ExternalProcessImporterHost::OnTemplateURLServiceLoaded,
+                     weak_ptr_factory_.GetWeakPtr()));
       model->Load();
     }
   }
 }