Move ContentScripts out of Extension

chrome/browser/devtools/devtools_sanity_browsertest.cc

Index: chrome/browser/devtools/devtools_sanity_browsertest.cc
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
index ac6fb735e63d4d3a3503d569dd332a1edbd87a4a..d90cf98c52378ebb7d21c43a04c4e5aa6b58497d 100644
--- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
@@ -24,6 +24,8 @@
 #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/manifest_handler.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ -186,6 +188,16 @@ class DevToolsExtensionTest : public DevToolsSanityTest,
   }
 
  protected:
+  virtual void SetUpOnMainThread() OVERRIDE {
+    DevToolsSanityTest::SetUpOnMainThread();
+    (new extensions::ContentScriptsHandler)->Register();
+  }
+
+  virtual void CleanUpOnMainThread() OVERRIDE {
+    extensions::ManifestHandler::ClearRegistryForTesting();
+    DevToolsSanityTest::CleanUpOnMainThread();
+  }
+
   // Load an extension from test\data\devtools\extensions\<extension_name>
   void LoadExtension(const char* extension_name) {
     base::FilePath path = test_extensions_dir_.AppendASCII(extension_name);