Switch Extensions::TabHelper to use WebContents, WebContentsUserData.

chrome/browser/extensions/page_action_controller.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/page_action_controller.h"
 
 #include "chrome/browser/extensions/browser_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/tab_helper.h"
@@ skipping 36 matching lines @@
   ExtensionService* service = GetExtensionService();
   if (!service)
     return ACTION_NONE;
 
   const Extension* extension = service->extensions()->GetByID(extension_id);
   CHECK(extension);
   ExtensionAction* page_action = extension->page_action();
   CHECK(page_action);
   int tab_id = ExtensionTabUtil::GetTabId(web_contents());
 
-  TabContents* tab_contents = TabContents::FromWebContents(web_contents());
-  tab_contents->extension_tab_helper()->active_tab_permission_manager()->
-      GrantIfRequested(extension);
+  extensions::TabHelper::FromWebContents(web_contents())->
+      active_tab_permission_manager()->GrantIfRequested(extension);
 
   switch (mouse_button) {
     case 1:  // left
     case 2:  // middle
       if (page_action->HasPopup(tab_id))
         return ACTION_SHOW_POPUP;
 
       GetExtensionService()->browser_event_router()->PageActionExecuted(
-          tab_contents->profile(),
+          Profile::FromBrowserContext(web_contents()->GetBrowserContext()),
           *page_action,
           tab_id,
           web_contents()->GetURL().spec(),
           mouse_button);
       return ACTION_NONE;
 
     case 3:  // right
       return extension->ShowConfigureContextMenus() ?
           ACTION_SHOW_CONTEXT_MENU : ACTION_NONE;
   }
@@ skipping 26 matching lines @@
 
   NotifyChange();
 }
 
 ExtensionService* PageActionController::GetExtensionService() const {
   TabContents* tab_contents = TabContents::FromWebContents(web_contents());
   return ExtensionSystem::Get(tab_contents->profile())->extension_service();
 }
 
 }  // namespace extensions