Remove TabContents from OmniboxEditController and friends.

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/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/notification_service.h"
 
 namespace events {
 const char kOnInputStarted[] = "omnibox.onInputStarted";
 const char kOnInputChanged[] = "omnibox.onInputChanged";
 const char kOnInputEntered[] = "omnibox.onInputEntered";
 const char kOnInputCancelled[] = "omnibox.onInputCancelled";
 }  // namespace events
@@ skipping 39 matching lines @@
   args->Set(1, Value::CreateIntegerValue(suggest_id));
 
   extensions::ExtensionSystem::Get(profile)->event_router()->
       DispatchEventToExtension(extension_id, events::kOnInputChanged,
                                args.Pass(), profile, GURL());
   return true;
 }
 
 // static
 void ExtensionOmniboxEventRouter::OnInputEntered(
-    TabContents* tab_contents,
+    content::WebContents* web_contents,
     const std::string& extension_id,
     const std::string& input) {
-  Profile* profile = tab_contents->profile();
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents->GetBrowserContext());
 
   const Extension* extension =
       ExtensionSystem::Get(profile)->extension_service()->extensions()->
           GetByID(extension_id);
   CHECK(extension);
-  extensions::TabHelper::FromWebContents(tab_contents->web_contents())->
+  extensions::TabHelper::FromWebContents(web_contents)->
       active_tab_permission_granter()->GrantIfRequested(extension);
 
   scoped_ptr<ListValue> args(new ListValue());
   args->Set(0, Value::CreateStringValue(input));
 
   extensions::ExtensionSystem::Get(profile)->event_router()->
       DispatchEventToExtension(extension_id, events::kOnInputEntered,
                                args.Pass(), profile, GURL());
 
   content::NotificationService::current()->Notify(
@@ skipping 205 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