Move ProfileKeyedAPI implementations to take BrowserContext in the constructor (part 2).

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 157 matching lines @@
 void ExtensionOmniboxEventRouter::OnInputCancelled(
     Profile* profile, const std::string& extension_id) {
   scoped_ptr<Event> event(new Event(
       omnibox::OnInputCancelled::kEventName,
       make_scoped_ptr(new base::ListValue())));
   event->restrict_to_browser_context = profile;
   ExtensionSystem::Get(profile)->event_router()->
       DispatchEventToExtension(extension_id, event.Pass());
 }
 
-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));
+OmniboxAPI::OmniboxAPI(content::BrowserContext* context)
+    : profile_(Profile::FromBrowserContext(context)),
+      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_) {
     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.Pointer();
 }
 
 // static
-OmniboxAPI* OmniboxAPI::Get(Profile* profile) {
-  return ProfileKeyedAPIFactory<OmniboxAPI>::GetForProfile(profile);
+OmniboxAPI* OmniboxAPI::Get(content::BrowserContext* context) {
+  return ProfileKeyedAPIFactory<OmniboxAPI>::GetForProfile(context);
 }
 
 void OmniboxAPI::Observe(int type,
                          const content::NotificationSource& source,
                          const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_EXTENSION_LOADED) {
     const Extension* extension =
         content::Details<const Extension>(details).ptr();
     const std::string& keyword = OmniboxInfo::GetKeyword(extension);
     if (!keyword.empty()) {
@@ skipping 170 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