Switch Extensions::TabHelper to use WebContents, WebContentsUserData.

chrome/browser/extensions/script_badge_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/script_badge_controller.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/browser_event_router.h"
@@ skipping 61 matching lines @@
     return ACTION_NONE;
 
   const Extension* extension = service->extensions()->GetByID(extension_id);
   CHECK(extension);
   ExtensionAction* script_badge = extension->script_badge();
   CHECK(script_badge);
 
   switch (mouse_button) {
     case 1:    // left
     case 2: {  // middle
+      extensions::TabHelper::FromWebContents(web_contents())->
+          active_tab_permission_manager()->GrantIfRequested(extension);
+
       TabContents* tab_contents = TabContents::FromWebContents(web_contents());
-      tab_contents->extension_tab_helper()->active_tab_permission_manager()->
-          GrantIfRequested(extension);
-
       // 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
       // full-colored immediately.
       if (script_badge->SetAppearance(SessionID::IdForTab(web_contents()),
                                       ExtensionAction::ACTIVE))
         NotifyChange();
 
       // Fire the scriptBadge.onClicked event.
       GetExtensionService()->browser_event_router()->ScriptBadgeExecuted(
@@ skipping 181 matching lines @@
       current_actions_.erase(it);
       break;
     }
   }
 
   CHECK_EQ(size_before, current_actions_.size() + 1);
   return true;
 }
 
 }  // namespace extensions