Move ContentScripts out of Extension

chrome/browser/extensions/extension_startup_browsertest.cc

Index: chrome/browser/extensions/extension_startup_browsertest.cc
diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc
index 83fb022b2d7b50512d9bf97c31fb218fef82abb8..4b804f85996f95e6a2e9b6a8424315fd69e18b0f 100644
--- a/chrome/browser/extensions/extension_startup_browsertest.cc
+++ b/chrome/browser/extensions/extension_startup_browsertest.cc
@@ -18,7 +18,9 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/api/content_scripts/content_scripts_handler.h"
 #include "chrome/common/extensions/feature_switch.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ -76,9 +78,15 @@ class ExtensionStartupTestBase : public InProcessBrowserTest {
       file_util::CopyDirectory(src_dir.AppendASCII("Extensions"),
                                profile_dir, true);  // recursive
     }
+
     return true;
   }
 
+  virtual void SetUpOnMainThread() OVERRIDE {
+    InProcessBrowserTest::SetUpOnMainThread();
+    (new extensions::ContentScriptsHandler)->Register();
+  }
+
   virtual void TearDown() {
     EXPECT_TRUE(file_util::Delete(preferences_file_, false));
 
@@ -86,6 +94,8 @@ class ExtensionStartupTestBase : public InProcessBrowserTest {
     file_util::Delete(user_scripts_dir_, true);
     file_util::Delete(extensions_dir_, true);
 
+    extensions::ManifestHandler::ClearRegistryForTesting();
+
     InProcessBrowserTest::TearDown();
   }