Switch Extensions::TabHelper to use WebContents, WebContentsUserData.

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"
@@ skipping 66 matching lines @@
 void ExtensionOmniboxEventRouter::OnInputEntered(
     TabContents* tab_contents,
     const std::string& extension_id,
     const std::string& input) {
   Profile* profile = tab_contents->profile();
 
   const Extension* extension =
       ExtensionSystem::Get(profile)->extension_service()->extensions()->
           GetByID(extension_id);
   CHECK(extension);
-  tab_contents->extension_tab_helper()->active_tab_permission_manager()->
-      GrantIfRequested(extension);
+  extensions::TabHelper::FromWebContents(tab_contents->web_contents())->
+      active_tab_permission_manager()->GrantIfRequested(extension);
 
   scoped_ptr<ListValue> args(new ListValue());
   args->Set(0, Value::CreateStringValue(input));
 
   profile->GetExtensionEventRouter()->DispatchEventToExtension(
       extension_id, events::kOnInputEntered, args.Pass(), profile, GURL());
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_OMNIBOX_INPUT_ENTERED,
       content::Source<Profile>(profile),
@@ skipping 202 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