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

chrome/browser/extensions/extension_tab_helper.cc

Index: chrome/browser/extensions/extension_tab_helper.cc
diff --git a/chrome/browser/extensions/extension_tab_helper.cc b/chrome/browser/extensions/extension_tab_helper.cc
index c7c1c5c748624c3a62878af2f983e760d617f087..d9d0efa0419c0da50ceb06600f061bc1c552b50d 100644
--- a/chrome/browser/extensions/extension_tab_helper.cc
+++ b/chrome/browser/extensions/extension_tab_helper.cc
@@ -53,7 +53,7 @@ ExtensionTabHelper::ExtensionTabHelper(TabContentsWrapper* wrapper)
     script_badge_controller_.reset(new ScriptBadgeController(wrapper));
   } else {
     script_executor_.reset(new ScriptExecutorImpl(wrapper->web_contents()));
-    action_box_controller_.reset(new PageActionController(wrapper, this));
+    action_box_controller_.reset(new PageActionController(wrapper));
   }
 }
 
@@ -66,26 +66,14 @@ void ExtensionTabHelper::CopyStateFrom(const ExtensionTabHelper& source) {
 }
 
 void ExtensionTabHelper::PageActionStateChanged() {
-  // TODO(kalman): replace this with just the Observer interface.
   web_contents()->NotifyNavigationStateChanged(
       content::INVALIDATE_TYPE_PAGE_ACTIONS);
-
-  FOR_EACH_OBSERVER(Observer, observers_, OnPageActionStateChanged());
 }
 
 void ExtensionTabHelper::GetApplicationInfo(int32 page_id) {
   Send(new ExtensionMsg_GetApplicationInfo(routing_id(), page_id));
 }
 
-void ExtensionTabHelper::AddObserver(ExtensionTabHelper::Observer* observer) {
-  observers_.AddObserver(observer);
-}
-
-void ExtensionTabHelper::RemoveObserver(
-    ExtensionTabHelper::Observer* observer) {
-  observers_.RemoveObserver(observer);
-}
-
 void ExtensionTabHelper::SetExtensionApp(const Extension* extension) {
   DCHECK(!extension || extension->GetFullLaunchURL().is_valid());
   extension_app_ = extension;