Uncouple ActiveScriptController from LocationBarController

chrome/browser/extensions/tab_helper.h

Index: chrome/browser/extensions/tab_helper.h
diff --git a/chrome/browser/extensions/tab_helper.h b/chrome/browser/extensions/tab_helper.h
index 0c828979ea9da567856992d68c86e7d989afe299..6bb8df22e5059d7e95eadd6c0cdbc3b25fe3c795 100644
--- a/chrome/browser/extensions/tab_helper.h
+++ b/chrome/browser/extensions/tab_helper.h
@@ -38,6 +38,7 @@ class Image;
 }
 
 namespace extensions {
+class ActiveScriptController;
 class BookmarkAppHelper;
 class Extension;
 class LocationBarController;
@@ -109,6 +110,10 @@ class TabHelper : public content::WebContentsObserver,
     return location_bar_controller_.get();
   }
 
+  ActiveScriptController* active_script_controller() {
+    return active_script_controller_.get();
+  }
+
   ActiveTabPermissionGranter* active_tab_permission_granter() {
     return active_tab_permission_granter_.get();
   }
@@ -245,6 +250,8 @@ class TabHelper : public content::WebContentsObserver,
 
   scoped_ptr<LocationBarController> location_bar_controller_;
 
+  scoped_ptr<ActiveScriptController> active_script_controller_;
+
   scoped_ptr<ActiveTabPermissionGranter> active_tab_permission_granter_;
 
   scoped_ptr<BookmarkAppHelper> bookmark_app_helper_;