Switch Extensions::TabHelper to use WebContents, WebContentsUserData.

chrome/browser/extensions/script_badge_controller.cc

Index: chrome/browser/extensions/script_badge_controller.cc
diff --git a/chrome/browser/extensions/script_badge_controller.cc b/chrome/browser/extensions/script_badge_controller.cc
index 3a2ef2b23c04007ad71380d543099c731723bf4d..7c1ad869c2c74882f48db278fa4531b6e85ea291 100644
--- a/chrome/browser/extensions/script_badge_controller.cc
+++ b/chrome/browser/extensions/script_badge_controller.cc
@@ -79,10 +79,10 @@ LocationBarController::Action ScriptBadgeController::OnClicked(
   switch (mouse_button) {
     case 1:    // left
     case 2: {  // middle
-      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);
 
+      TabContents* tab_contents = TabContents::FromWebContents(web_contents());
       // Even if clicking the badge doesn't immediately cause the extension to
       // run script on the page, we want to help users associate clicking with
       // the extension having permission to modify the page, so we make the icon