Revert 137630 - Broke ASAN

chrome/browser/extensions/page_action_controller.h

Index: chrome/browser/extensions/page_action_controller.h
===================================================================
--- chrome/browser/extensions/page_action_controller.h	(revision 137631)
+++ chrome/browser/extensions/page_action_controller.h	(working copy)
@@ -6,12 +6,7 @@
 #define CHROME_BROWSER_EXTENSIONS_PAGE_ACTION_CONTROLLER_H_
 #pragma once
 
-#include <set>
-#include <string>
-
-#include "base/observer_list.h"
 #include "chrome/browser/extensions/action_box_controller.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
 
 class ExtensionService;
 class TabContentsWrapper;
@@ -19,30 +14,22 @@
 namespace extensions {
 
 // An ActionBoxController which corresponds to the page actions of an extension.
-class PageActionController : public ActionBoxController,
-                             public ExtensionTabHelper::Observer {
+class PageActionController : public ActionBoxController {
  public:
-  PageActionController(TabContentsWrapper* tab_contents,
-                       ExtensionTabHelper* tab_helper);
+  explicit PageActionController(TabContentsWrapper* tab_contents);
   virtual ~PageActionController();
 
-  // ActionBoxController implementation.
-  virtual scoped_ptr<std::vector<ExtensionAction*> > GetCurrentActions()
-      OVERRIDE;
+  virtual scoped_ptr<DataList> GetAllBadgeData() OVERRIDE;
+
   virtual Action OnClicked(const std::string& extension_id,
                            int mouse_button) OVERRIDE;
 
-  // ExtensionTabHelper::Observer implementation.
-  virtual void OnPageActionStateChanged() OVERRIDE;
-
  private:
   // Gets the ExtensionService for |tab_contents_|.
   ExtensionService* GetExtensionService();
 
   TabContentsWrapper* tab_contents_;
 
-  ExtensionTabHelper* tab_helper_;
-
   DISALLOW_COPY_AND_ASSIGN(PageActionController);
 };