Move ContentScripts out of Extension

chrome/browser/extensions/api/management/management_browsertest.cc

Index: chrome/browser/extensions/api/management/management_browsertest.cc
diff --git a/chrome/browser/extensions/api/management/management_browsertest.cc b/chrome/browser/extensions/api/management/management_browsertest.cc
index b2dc0498ae94b5f3e1ad34170b6ecd2ee3308bc2..98db28e7af6f0f7a555f1985e2af4b5c4a3466a4 100644
--- a/chrome/browser/extensions/api/management/management_browsertest.cc
+++ b/chrome/browser/extensions/api/management/management_browsertest.cc
@@ -19,6 +19,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/extensions/api/content_scripts/content_scripts_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ -121,6 +123,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, InstallThenCancel) {
 #define MAYBE_InstallRequiresConfirm InstallRequiresConfirm
 #endif
 IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, MAYBE_InstallRequiresConfirm) {
+  (new extensions::ContentScriptsHandler)->Register();
+
   // Installing the extension without an auto confirming UI should result in
   // it being disabled, since good.crx has permissions that require approval.
   ExtensionService* service = extensions::ExtensionSystem::Get(
@@ -134,6 +138,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, MAYBE_InstallRequiresConfirm) {
   ASSERT_TRUE(InstallExtensionWithUIAutoConfirm(
       test_data_dir_.AppendASCII("good.crx"), 1, browser()));
   UninstallExtension(id);
+
+  extensions::ManifestHandler::ClearRegistryForTesting();
 }
 
 // Tests that disabling and re-enabling an extension works.