Switch ScriptBadgeController and PageActionController to use WebContents.

chrome/browser/extensions/page_action_controller.h

Index: chrome/browser/extensions/page_action_controller.h
diff --git a/chrome/browser/extensions/page_action_controller.h b/chrome/browser/extensions/page_action_controller.h
index ab4097e3e93b0506e3eebeed8d34db41294d350a..1f711f616c3d7a712165ebc7f0139f21c36d3819 100644
--- a/chrome/browser/extensions/page_action_controller.h
+++ b/chrome/browser/extensions/page_action_controller.h
@@ -13,7 +13,6 @@
 #include "content/public/browser/web_contents_observer.h"
 
 class ExtensionService;
-class TabContents;
 
 namespace extensions {
 
@@ -22,7 +21,7 @@ namespace extensions {
 class PageActionController : public LocationBarController,
                              public content::WebContentsObserver {
  public:
-  explicit PageActionController(TabContents* tab_contents);
+  explicit PageActionController(content::WebContents* web_contents);

[Aaron Boodman, 2012/09/05 22:02:00]

General comment. It is really important that all of these things which were
previously relying on TabContents still only happen for the case that
WebContents is actually a tab.

I think you're most likely aware of this, just wanted to be sure.

   virtual ~PageActionController();
 
   // LocationBarController implementation.
@@ -39,11 +38,9 @@ class PageActionController : public LocationBarController,
       const content::FrameNavigateParams& params) OVERRIDE;
 
  private:
-  // Gets the ExtensionService for |tab_contents_|.
+  // Gets the ExtensionService for the web contents.
   ExtensionService* GetExtensionService() const;
 
-  TabContents* tab_contents_;
-
   DISALLOW_COPY_AND_ASSIGN(PageActionController);
 };