Switch ScriptBadgeController and PageActionController to use WebContents.

chrome/browser/extensions/tab_helper.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/tab_helper.h"
 
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/app_notify_channel_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
@@ skipping 48 matching lines @@
           extension_function_dispatcher_(tab_contents->profile(), this)),
       pending_web_app_action_(NONE),
       tab_contents_(tab_contents),
       script_executor_(tab_contents->web_contents()),
       active_tab_permission_manager_(
           tab_contents->web_contents(),
           SessionID::IdForTab(tab_contents),
           tab_contents->profile()) {
   if (switch_utils::AreScriptBadgesEnabled()) {
     location_bar_controller_.reset(new ScriptBadgeController(
-        tab_contents, &script_executor_));
+        tab_contents->web_contents(), &script_executor_));
   } else {
-    location_bar_controller_.reset(new PageActionController(tab_contents));
+    location_bar_controller_.reset(
+        new PageActionController(tab_contents->web_contents()));
   }
   registrar_.Add(this,
                  content::NOTIFICATION_LOAD_STOP,
                  content::Source<NavigationController>(
                     &tab_contents->web_contents()->GetController()));
 }
 
 TabHelper::~TabHelper() {
 }
 
@@ skipping 353 matching lines @@
     // malware site etc). When this happens, we abort the shortcut update.
     NavigationEntry* entry = controller.GetLastCommittedEntry();
     if (entry)
       GetApplicationInfo(entry->GetPageID());
     else
       pending_web_app_action_ = NONE;
   }
 }
 
 }  // namespace extensions