Revert half of the changes from 137638 that are probably causing breakages in

chrome/browser/extensions/extension_tab_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_TAB_HELPER_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_TAB_HELPER_H_
 #pragma once
 
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
@@ skipping 22 matching lines @@
 
 // Per-tab extension helper. Also handles non-extension apps.
 class ExtensionTabHelper
     : public content::WebContentsObserver,
       public ExtensionFunctionDispatcher::Delegate,
       public ImageLoadingTracker::Observer,
       public WebstoreInlineInstaller::Delegate,
       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();
 
   // Copies the internal state from another ExtensionTabHelper.
   void CopyStateFrom(const ExtensionTabHelper& source);
 
   ExtensionTabHelperDelegate* delegate() const { return delegate_; }
   void set_delegate(ExtensionTabHelperDelegate* d) { delegate_ = d; }
 
   // Call this after updating a page action to notify clients about the changes.
   void PageActionStateChanged();
 
   // Requests application info for the specified page. This is an asynchronous
   // request. The delegate is notified by way of OnDidGetApplicationInfo when
   // 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
   // tab becomes an app-tab. WebContents does not listen for unload events for
   // the extension. It's up to consumers of WebContents to do that.
   //
   // NOTE: this should only be manipulated before the tab is added to a browser.
   // TODO(sky): resolve if this is the right way to identify an app tab. If it
   // is, than this should be passed in the constructor.
   void SetExtensionApp(const extensions::Extension* extension);
@@ skipping 122 matching lines @@
   // script_badge_controller will have a value, depending on whether the action
   // box is turned on.
   scoped_ptr<extensions::ScriptExecutor> script_executor_;
   scoped_ptr<extensions::ActionBoxController> action_box_controller_;
   scoped_ptr<extensions::ScriptBadgeController> script_badge_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionTabHelper);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_TAB_HELPER_H_