Convert NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED to CallbackList

chrome/browser/extensions/api/omnibox/omnibox_api.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/extensions/api/omnibox/omnibox_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string16.h"
@@ skipping 165 matching lines @@
 }
 
 OmniboxAPI::OmniboxAPI(Profile* profile)
     : profile_(profile),
       url_service_(TemplateURLServiceFactory::GetForProfile(profile)) {
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                  content::Source<Profile>(profile));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::Source<Profile>(profile));
   if (url_service_) {
-    registrar_.Add(this, chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
-                   content::Source<TemplateURLService>(url_service_));
+    template_url_sub_ = url_service_->RegisterOnLoadedCallback(
+        base::Bind(&OmniboxAPI::OnTemplateURLsLoaded,
+                   base::Unretained(this)));
   }
 
   // Use monochrome icons for Omnibox icons.
   omnibox_popup_icon_manager_.set_monochrome(true);
   omnibox_icon_manager_.set_monochrome(true);
   omnibox_icon_manager_.set_padding(gfx::Insets(0, kOmniboxIconPaddingLeft,
                                                 0, kOmniboxIconPaddingRight));
 }
 
+void OmniboxAPI::Shutdown() {
+  template_url_sub_.reset();
+}
+
 OmniboxAPI::~OmniboxAPI() {
 }
 
 static base::LazyInstance<ProfileKeyedAPIFactory<OmniboxAPI> >
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // static
 ProfileKeyedAPIFactory<OmniboxAPI>* OmniboxAPI::GetFactoryInstance() {
   return &g_factory.Get();
 }
@@ skipping 31 matching lines @@
         content::Details<UnloadedExtensionInfo>(details)->extension;
     if (!OmniboxInfo::GetKeyword(extension).empty()) {
       if (url_service_) {
         if (url_service_->loaded())
           url_service_->UnregisterExtensionKeyword(extension->id());
         else
           pending_extensions_.erase(extension);
       }
     }
   } else {
-    DCHECK(type == chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED);
-    // Load pending extensions.
-    for (PendingExtensions::const_iterator i(pending_extensions_.begin());
-         i != pending_extensions_.end(); ++i) {
-      url_service_->RegisterExtensionKeyword((*i)->id(),
-                                             (*i)->name(),
-                                             OmniboxInfo::GetKeyword(*i));
-    }
-    pending_extensions_.clear();
+    NOTREACHED();
   }
 }
 
 gfx::Image OmniboxAPI::GetOmniboxIcon(const std::string& extension_id) {
   return gfx::Image::CreateFrom1xBitmap(
       omnibox_icon_manager_.GetIcon(extension_id));
 }
 
 gfx::Image OmniboxAPI::GetOmniboxPopupIcon(const std::string& extension_id) {
   return gfx::Image::CreateFrom1xBitmap(
       omnibox_popup_icon_manager_.GetIcon(extension_id));
 }
 
+void OmniboxAPI::OnTemplateURLsLoaded() {
+  // Register keywords for pending extensions.
+  template_url_sub_.reset();
+  for (PendingExtensions::const_iterator i(pending_extensions_.begin());
+       i != pending_extensions_.end(); ++i) {
+    url_service_->RegisterExtensionKeyword((*i)->id(),
+                                           (*i)->name(),
+                                           OmniboxInfo::GetKeyword(*i));
+  }
+  pending_extensions_.clear();
+}
+
 template <>
 void ProfileKeyedAPIFactory<OmniboxAPI>::DeclareFactoryDependencies() {
   DependsOn(ExtensionSystemFactory::GetInstance());
   DependsOn(TemplateURLServiceFactory::GetInstance());
 }
 
 bool OmniboxSendSuggestionsFunction::RunImpl() {
   scoped_ptr<SendSuggestions::Params> params(
       SendSuggestions::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
@@ skipping 108 matching lines @@
     for (size_t i = 0; i < description_styles.size(); ++i) {
       if (description_styles[i].offset > placeholder)
         description_styles[i].offset += replacement.length() - 2;
     }
   }
 
   match->contents.assign(description);
 }
 
 }  // namespace extensions