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 97162ca4af8f6f412f5c72622e03fd39b4e841ae..49e4d963759c57ccd98f779baaf50d948fc6724e 100644
--- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
@@ -22,6 +22,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/extension_manifest_constants.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/child_process_data.h"
@@ -187,6 +190,13 @@ class DevToolsExtensionTest : public DevToolsSanityTest,
     ASSERT_TRUE(LoadExtensionFromPath(path)) << "Failed to load extension.";
   }
 
+  void SetUpOnMainThread() OVERRIDE {
+    DevToolsSanityTest::SetUpOnMainThread();
+    extensions::ManifestHandler::Register(
+        extension_manifest_keys::kContentScripts,
+        new extensions::ContentScriptsHandler);
+  }
+
  private:
   bool LoadExtensionFromPath(const FilePath& path) {
     ExtensionService* service = extensions::ExtensionSystem::Get(