Move ContentScripts out of Extension

chrome/browser/extensions/subscribe_page_action_browsertest.cc

Index: chrome/browser/extensions/subscribe_page_action_browsertest.cc
diff --git a/chrome/browser/extensions/subscribe_page_action_browsertest.cc b/chrome/browser/extensions/subscribe_page_action_browsertest.cc
index 471ad5c2e0cae81995b0cc8e105de17f0a598387..ec21ccbbaf4345beabd908b9d3123cbdd8b12275 100644
--- a/chrome/browser/extensions/subscribe_page_action_browsertest.cc
+++ b/chrome/browser/extensions/subscribe_page_action_browsertest.cc
@@ -5,7 +5,9 @@
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/extensions/api/content_scripts/content_scripts_handler.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
@@ -13,8 +15,8 @@
 #include "extensions/common/constants.h"
 
 using content::WebContents;
-using extensions::Extension;
 
+namespace extensions {
 namespace {
 
 const char kSubscribePage[] = "/subscribe.html";
@@ -65,7 +67,7 @@ GURL GetFeedUrl(net::TestServer* server, const std::string& feed_page,
   if (direct_url) {
     // We navigate directly to the subscribe page for feeds where the feed
     // sniffing won't work, in other words, as is the case for malformed feeds.
-    return GURL(std::string(extensions::kExtensionScheme) +
+    return GURL(std::string(kExtensionScheme) +
         content::kStandardSchemeSeparator +
         extension_id + std::string(kSubscribePage) + std::string("?") +
         feed_url.spec() + std::string("&synchronous"));
@@ -137,6 +139,7 @@ void NavigateToFeedAndValidate(net::TestServer* server,
 // Makes sure that the RSS detects RSS feed links, even when rel tag contains
 // more than just "alternate".
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, RSSMultiRelLink) {
+  (new ContentScriptsHandler)->Register();
   ASSERT_TRUE(test_server()->Start());
 
   ASSERT_TRUE(LoadExtension(
@@ -149,6 +152,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, RSSMultiRelLink) {
   ui_test_utils::NavigateToURL(browser(), feed_url);
   // We should now have one page action ready to go in the LocationBar.
   ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(1));
+
+  ManifestHandler::ClearRegistryForTesting();
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed1) {
@@ -347,3 +352,5 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeedNoLinks) {
       "Desc",
       "No error");
 }
+
+}  // namespace extensions