Switch Extensions::TabHelper to use WebContents, WebContentsUserData.

chrome/browser/extensions/page_action_controller.cc

Index: chrome/browser/extensions/page_action_controller.cc
diff --git a/chrome/browser/extensions/page_action_controller.cc b/chrome/browser/extensions/page_action_controller.cc
index 48996b1bc5e1daf03ad28f1b375e8bdb06f4fad9..67235783bdb3bd8d8d6a1802e8a9d5ba9e7e5978 100644
--- a/chrome/browser/extensions/page_action_controller.cc
+++ b/chrome/browser/extensions/page_action_controller.cc
@@ -54,9 +54,8 @@ LocationBarController::Action PageActionController::OnClicked(
   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
@@ -65,7 +64,7 @@ LocationBarController::Action PageActionController::OnClicked(
         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(),