Revert 137630 - Broke ASAN

chrome/browser/extensions/extension_tab_helper.h

Index: chrome/browser/extensions/extension_tab_helper.h
===================================================================
--- chrome/browser/extensions/extension_tab_helper.h	(revision 137631)
+++ chrome/browser/extensions/extension_tab_helper.h	(working copy)
@@ -7,7 +7,6 @@
 #pragma once
 
 #include "base/memory/weak_ptr.h"
-#include "base/observer_list.h"
 #include "chrome/browser/extensions/app_notify_channel_setup.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
@@ -25,11 +24,6 @@
 struct LoadCommittedDetails;
 }
 
-namespace extensions {
-class ActionBoxController;
-class ScriptExecutor;
-}
-
 // Per-tab extension helper. Also handles non-extension apps.
 class ExtensionTabHelper
     : public content::WebContentsObserver,
@@ -39,15 +33,6 @@
       public AppNotifyChannelSetup::Delegate,
       public base::SupportsWeakPtr<ExtensionTabHelper> {
  public:
-  class Observer {
-   public:
-    // Called when the page action state (such as visibility, title) changes.
-    virtual void OnPageActionStateChanged() = 0;
-
-   protected:
-    virtual ~Observer() {}
-  };
-
   explicit ExtensionTabHelper(TabContentsWrapper* wrapper);
   virtual ~ExtensionTabHelper();
 
@@ -65,10 +50,6 @@
   // the data is available.
   void GetApplicationInfo(int32 page_id);
 
-  // Observer management.
-  void AddObserver(Observer* observer);
-  void RemoveObserver(Observer* observer);
-
   // App extensions ------------------------------------------------------------
 
   // Sets the extension denoting this as an app. If |extension| is non-null this
@@ -109,14 +90,6 @@
     return content::WebContentsObserver::web_contents();
   }
 
-  extensions::ScriptExecutor* script_executor() {
-    return script_executor_.get();
-  }
-
-  extensions::ActionBoxController* action_box_controller() {
-    return action_box_controller_.get();
-  }
-
   // Sets a non-extension app icon associated with WebContents and fires an
   // INVALIDATE_TYPE_TITLE navigation state change to trigger repaint of title.
   void SetAppIcon(const SkBitmap& app_icon);
@@ -199,12 +172,6 @@
 
   TabContentsWrapper* wrapper_;
 
-  scoped_ptr<extensions::ScriptExecutor> script_executor_;
-
-  scoped_ptr<extensions::ActionBoxController> action_box_controller_;
-
-  ObserverList<Observer> observers_;
-
   DISALLOW_COPY_AND_ASSIGN(ExtensionTabHelper);
 };