Don't allow content scripts to execute on file:// urls.

This requires a command line flag for the page cycler tests,
since those load file:// urls.

BUG=27877
TEST=Bunch of tests affected.

Review URL: http://codereview.chromium.org/402029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32271 0039d316-1c4b-4281-b951-d872f2087c98

33 files changed, 230 insertions, 209 deletions

diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc
index a10446f..6a6d88a 100644
--- a/chrome/browser/extensions/extension_browsertests_misc.cc
+++ b/chrome/browser/extensions/extension_browsertests_misc.cc
@@ -30,6 +30,8 @@
 
 const std::wstring kSubscribePage =
     L"files/extensions/subscribe_page_action/subscribe.html";
+const std::wstring kFeedPage = L"files/feeds/feed.html";
+const std::wstring kNoFeedPage = L"files/feeds/no_feed.html";
 const std::wstring kValidFeed0 = L"files/feeds/feed_script.xml";
 const std::wstring kValidFeed1 = L"files/feeds/feed1.xml";
 const std::wstring kValidFeed2 = L"files/feeds/feed2.xml";
@@ -38,6 +40,9 @@ const std::wstring kValidFeed4 = L"files/feeds/feed4.xml";
 const std::wstring kValidFeed5 = L"files/feeds/feed5.xml";
 const std::wstring kInvalidFeed1 = L"files/feeds/feed_invalid1.xml";
 const std::wstring kInvalidFeed2 = L"files/feeds/feed_invalid2.xml";
+const std::wstring kLocalization =
+    L"file/extensions/browsertest/title_localized_pa/simple.html";
+const std::wstring kTestFile = L"file/extensions/test_file.html";
 
 // Looks for an ExtensionHost whose URL has the given path component (including
 // leading slash).  Also verifies that the expected number of hosts are loaded.
@@ -208,6 +213,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TabContents) {
 #if defined(OS_WIN) || defined(OS_LINUX)
 // Tests that we can load page actions in the Omnibox.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageAction) {
+  HTTPTestServer* server = StartHTTPServer();
+
   // This page action will not show an icon, since it doesn't specify one but
   // is included here to test for a crash (http://crbug.com/25562).
   ASSERT_TRUE(LoadExtension(
@@ -220,36 +227,28 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageAction) {
   ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(0));
 
   // Navigate to the feed page.
-  FilePath test_dir;
-  PathService::Get(chrome::DIR_TEST_DATA, &test_dir);
-  FilePath feed = test_dir.AppendASCII("feeds")
-                          .AppendASCII("feed.html");
-
-  ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(feed));
-
+  GURL feed_url = server->TestServerPageW(kFeedPage);
+  ui_test_utils::NavigateToURL(browser(), feed_url);
   // We should now have one page action ready to go in the LocationBar.
   ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(1));
 
-  FilePath no_feed = test_dir.AppendASCII("feeds")
-                             .AppendASCII("nofeed.html");
-
+  // Navigate to a page with no feed.
+  GURL no_feed = server->TestServerPageW(kNoFeedPage);
+  ui_test_utils::NavigateToURL(browser(), no_feed);
   // Make sure the page action goes away.
-  ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(no_feed));
   ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(0));
 }
 
 // Tests that the location bar forgets about unloaded page actions.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, UnloadPageAction) {
+  HTTPTestServer* server = StartHTTPServer();
+
   FilePath extension_path(test_data_dir_.AppendASCII("subscribe_page_action"));
   ASSERT_TRUE(LoadExtension(extension_path));
 
   // Navigation prompts the location bar to load page actions.
-  FilePath test_dir;
-  PathService::Get(chrome::DIR_TEST_DATA, &test_dir);
-  FilePath feed = test_dir.AppendASCII("feeds")
-                          .AppendASCII("feed.html");
-
-  ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(feed));
+  GURL feed_url = server->TestServerPageW(kFeedPage);
+  ui_test_utils::NavigateToURL(browser(), feed_url);
   ASSERT_TRUE(WaitForPageActionCountChangeTo(1));
 
   UnloadExtension(last_loaded_extension_id_);
@@ -282,16 +281,15 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TitleLocalizationBrowserAction) {
 // Tests that tooltips of a page action icon can be specified using UTF8.
 // See http://crbug.com/25349.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TitleLocalizationPageAction) {
+  HTTPTestServer* server = StartHTTPServer();
+
   FilePath extension_path(test_data_dir_.AppendASCII("browsertest")
                                         .AppendASCII("title_localized_pa"));
   ASSERT_TRUE(LoadExtension(extension_path));
 
   // Any navigation prompts the location bar to load the page action.
-  FilePath test_dir;
-  PathService::Get(chrome::DIR_TEST_DATA, &test_dir);
-  FilePath path = extension_path.AppendASCII("simple.html");
-
-  ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(path));
+  GURL url = server->TestServerPageW(kLocalization);
+  ui_test_utils::NavigateToURL(browser(), url);
   ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(1));
 
   ExtensionsService* service = browser()->profile()->GetExtensionsService();
@@ -529,6 +527,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, LastError) {
 #if defined(OS_WIN)  // TODO(port) - enable.
 // Tests that message passing between extensions and content scripts works.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MessagingContentScript) {
+  HTTPTestServer* server = StartHTTPServer();
+
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("good").AppendASCII("Extensions")
                     .AppendASCII("bjafgdebaacbbbecmhlhpofkepfkgcpa")
@@ -550,11 +550,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MessagingContentScript) {
   ExtensionHost* host = FindHostWithPath(manager, "/toolstrip.html", 1);
 
   // Load the tab whose content script will communicate with our toolstrip.
-  FilePath test_file;
-  PathService::Get(chrome::DIR_TEST_DATA, &test_file);
-  test_file = test_file.AppendASCII("extensions")
-                       .AppendASCII("test_file.html");
-  ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(test_file));
+  GURL url = server->TestServerPageW(kTestFile);
+  ui_test_utils::NavigateToURL(browser(), url);
 
   // Test extension->tab messaging.
   bool result = false;
@@ -562,7 +559,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MessagingContentScript) {
       host->render_view_host(), L"", L"testPostMessage()", &result);
   EXPECT_TRUE(result);
 
-  // Test port naming
+  // Test port naming.
   result = false;
   ui_test_utils::ExecuteJavaScriptAndExtractBool(
       host->render_view_host(), L"", L"testPortName()", &result);
diff --git a/chrome/browser/extensions/extension_startup_unittest.cc b/chrome/browser/extensions/extension_startup_unittest.cc
index 00089ae..f076b37 100644
--- a/chrome/browser/extensions/extension_startup_unittest.cc
+++ b/chrome/browser/extensions/extension_startup_unittest.cc
@@ -131,12 +131,9 @@ class ExtensionStartupTestBase
 
   void TestInjection(bool expect_css, bool expect_script) {
     // Load a page affected by the content script and test to see the effect.
-    FilePath test_file;
-    PathService::Get(chrome::DIR_TEST_DATA, &test_file);
-    test_file = test_file.AppendASCII("extensions")
-                         .AppendASCII("test_file.html");
-
-    ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(test_file));
+    HTTPTestServer* server = StartHTTPServer();
+    GURL url = server->TestServerPage("file/extensions/test_file.html");
+    ui_test_utils::NavigateToURL(browser(), url);
 
     bool result = false;
     ui_test_utils::ExecuteJavaScriptAndExtractBool(
diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc
index f9af689..5024757 100644
--- a/chrome/browser/extensions/extensions_service_unittest.cc
+++ b/chrome/browser/extensions/extensions_service_unittest.cc
@@ -539,11 +539,11 @@ TEST_F(ExtensionsServiceTest, LoadAllExtensionsFromDirectorySuccess) {
       extension->toolstrips();
   ASSERT_EQ(2u, scripts.size());
   EXPECT_EQ(3u, scripts[0].url_patterns().size());
-  EXPECT_EQ("file://*",
-            scripts[0].url_patterns()[0].GetAsString());
   EXPECT_EQ("http://*.google.com/*",
-            scripts[0].url_patterns()[1].GetAsString());
+            scripts[0].url_patterns()[0].GetAsString());
   EXPECT_EQ("https://*.google.com/*",
+            scripts[0].url_patterns()[1].GetAsString());
+  EXPECT_EQ("http://localhost/*",
             scripts[0].url_patterns()[2].GetAsString());
   EXPECT_EQ(2u, scripts[0].js_scripts().size());
   ExtensionResource resource00(scripts[0].js_scripts()[0].extension_root(),
diff --git a/chrome/browser/extensions/stubs_apitest.cc b/chrome/browser/extensions/stubs_apitest.cc
index 4ba81c7..bdbf69c 100644
--- a/chrome/browser/extensions/stubs_apitest.cc
+++ b/chrome/browser/extensions/stubs_apitest.cc
@@ -15,15 +15,15 @@
 // should be available in content scripts) or update the list of privileged APIs
 // in renderer_extension_bindings.js.
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Stubs) {
+  HTTPTestServer* server = StartHTTPServer();
+
   ASSERT_TRUE(RunExtensionTest("stubs")) << message_;
 
-  // Navigate to a simple file:// page, which should get the content script
+  // Navigate to a simple http:// page, which should get the content script
   // injected and run the rest of the test.
-  FilePath test_dir;
-  ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
-  FilePath simple_html_path = test_dir.AppendASCII("simple.html");
-  ui_test_utils::NavigateToURL(browser(),
-                               GURL(simple_html_path.value()));
+  GURL url = server->TestServerPage("file/extensions/test_file.html");
+  ui_test_utils::NavigateToURL(browser(), url);
+
   ResultCatcher catcher;
   ASSERT_TRUE(catcher.GetNextResult());
 }
diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc
index 35cf1d8..aea50cf 100644
--- a/chrome/browser/extensions/user_script_listener_unittest.cc
+++ b/chrome/browser/extensions/user_script_listener_unittest.cc
@@ -295,7 +295,7 @@ TEST_F(UserScriptListenerTest, SingleExtension) {
   EXPECT_TRUE(resource_tester_->IsRequestComplete(0));
 }
 
-// Loads a single extension and ensures that requests to URLs with content
+// Loads two extensions and ensures that requests to URLs with content
 // scripts are delayed.
 TEST_F(UserScriptListenerTest, UnloadExtension) {
   FilePath extensions_path;
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 060adffd..61c0b98 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -187,10 +187,14 @@ const char kEnableExtensionTimelineApi[]    = "enable-extension-timeline-api";
 // Enable the fastback page cache.
 const char kEnableFastback[]                = "enable-fastback";
 
-// By default, cookies are not allowed on file://. They are needed in for
+// By default, cookies are not allowed on file://. They are needed for
 // testing, for example page cycler and layout tests.  See bug 1157243.
 const char kEnableFileCookies[]             = "enable-file-cookies";
 
+// By default, js content scripts are not allowed on file://. They are needed
+// for page cycler tests.  See http://crbug.com/27877.
+const char kEnableJsOnFileUrls[]         = "enable-content-script-on-file-urls";
+
 // Disable LocalStorage.
 const char kDisableLocalStorage[]            = "disable-local-storage";
 
@@ -203,7 +207,7 @@ const char kEnableLogging[]                 = "enable-logging";
 // assumed to be sRGB.
 const char kEnableMonitorProfile[]          = "enable-monitor-profile";
 
-// Enable Native Web Worker support
+// Enable Native Web Worker support.
 const char kEnableNativeWebWorkers[]        = "enable-native-web-workers";
 
 // Enable AutoFill++.
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index db22875..3ab2fb7 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -70,6 +70,7 @@ extern const char kEnableExperimentalWebGL[];
 extern const char kEnableExtensionTimelineApi[];
 extern const char kEnableFastback[];
 extern const char kEnableFileCookies[];
+extern const char kEnableJsOnFileUrls[];
 extern const char kDisableLocalStorage[];
 extern const char kEnableLogging[];
 extern const char kEnableMonitorProfile[];
diff --git a/chrome/common/extensions/docs/content_scripts.html b/chrome/common/extensions/docs/content_scripts.html
index 2fd23a3..c94ee56 100644
--- a/chrome/common/extensions/docs/content_scripts.html
+++ b/chrome/common/extensions/docs/content_scripts.html
@@ -314,6 +314,9 @@ They <b>cannot</b>:
   <li>
     Make cross-site XMLHttpRequests
   </li>
+  <li>
+    Execute on file:// urls.
+  </li>
 </ul>
 
 <p>
diff --git a/chrome/common/extensions/docs/static/content_scripts.html b/chrome/common/extensions/docs/static/content_scripts.html
index 26d83bb..9c90859 100644
--- a/chrome/common/extensions/docs/static/content_scripts.html
+++ b/chrome/common/extensions/docs/static/content_scripts.html
@@ -40,6 +40,9 @@ They <b>cannot</b>:
   <li>
     Make cross-site XMLHttpRequests
   </li>
+  <li>
+    Execute on file:// urls.
+  </li>
 </ul>
 
 <p>
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 1a665d4..f09fba8 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -247,11 +247,21 @@ bool Extension::LoadUserScriptHelper(const DictionaryValue* content_script,
           IntToString(definition_index), IntToString(j));
       return false;
     }
+    std::string scheme = pattern.scheme();
+    if (scheme == "file") {
+      // No content scripts are allowed unless the command line override switch
+      // was provided.
+      if (!CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableJsOnFileUrls)) {
+        *error = errors::kInvalidJsMatches;
+        return false;
+      }
+    }
 
     result->add_url_pattern(pattern);
   }
 
-  // include/exclude globs (mostly for Greasemonkey compat)
+  // Include/exclude globs (mostly for Greasemonkey compatibility).
   if (!LoadGlobsHelper(content_script, definition_index, keys::kIncludeGlobs,
                        error, &UserScript::add_glob, result)) {
       return false;
@@ -262,7 +272,7 @@ bool Extension::LoadUserScriptHelper(const DictionaryValue* content_script,
       return false;
   }
 
-  // js and css keys
+  // js and css keys.
   ListValue* js = NULL;
   if (content_script->HasKey(keys::kJs) &&
       !content_script->GetList(keys::kJs, &js)) {
diff --git a/chrome/common/extensions/extension_constants.cc b/chrome/common/extensions/extension_constants.cc
index 0dbab1f..c2700dc 100644
--- a/chrome/common/extensions/extension_constants.cc
+++ b/chrome/common/extensions/extension_constants.cc
@@ -91,6 +91,8 @@ const char* kInvalidJs =
     "Invalid value for 'content_scripts[*].js[*]'.";
 const char* kInvalidJsList =
     "Required value 'content_scripts[*].js is invalid.";
+const char* kInvalidJsMatches =
+    "Content scripts can not be executed on file:// urls.";
 const char* kInvalidKey =
     "Value 'key' is missing or invalid.";
 const char* kInvalidManifest =
diff --git a/chrome/common/extensions/extension_constants.h b/chrome/common/extensions/extension_constants.h
index d44f7b9..ff9836f 100644
--- a/chrome/common/extensions/extension_constants.h
+++ b/chrome/common/extensions/extension_constants.h
@@ -77,6 +77,7 @@ namespace extension_manifest_errors {
   extern const char* kInvalidGlob;
   extern const char* kInvalidJs;
   extern const char* kInvalidJsList;
+  extern const char* kInvalidJsMatches;
   extern const char* kInvalidKey;
   extern const char* kInvalidManifest;
   extern const char* kInvalidMatchCount;
diff --git a/chrome/test/data/extensions/api_test/stubs/manifest.json b/chrome/test/data/extensions/api_test/stubs/manifest.json
index 0149ae6..6909f1e 100644
--- a/chrome/test/data/extensions/api_test/stubs/manifest.json
+++ b/chrome/test/data/extensions/api_test/stubs/manifest.json
@@ -4,7 +4,7 @@
   "background_page": "background.html",
   "content_scripts": [
     {
-      "matches": ["http://*/*", "file://*"],
+      "matches": ["http://*/*"],
       "js":["content_script.js"]
     }
   ]
diff --git a/chrome/test/data/extensions/browsertest/title_localized_pa/manifest.json b/chrome/test/data/extensions/browsertest/title_localized_pa/manifest.json
index 59091af..3d1d684 100644
--- a/chrome/test/data/extensions/browsertest/title_localized_pa/manifest.json
+++ b/chrome/test/data/extensions/browsertest/title_localized_pa/manifest.json
@@ -2,7 +2,7 @@
    "background_page": "background.html",
    "content_scripts": [ {
       "js": [ "script.js" ],
-      "matches": [ "http://*/*", "file://*.*" ]
+      "matches": [ "http://*/*" ]
    } ],
    "description": "Hreggvi\u00F0ur: l10n page action",
    "name": "Hreggvi\u00F0ur is my name",
diff --git a/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json
index 585083e..f77a996 100644
--- a/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json
+++ b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json
@@ -19,7 +19,7 @@
   "permissions": ["tabs", "http://*.google.com/*", "https://*.google.com/*"],
   "content_scripts": [
     {
-      "matches": ["file://*", "http://*.google.com/*", "https://*.google.com/*"],
+      "matches": ["http://*.google.com/*", "https://*.google.com/*", "http://localhost/*"],
       "js": ["script1.js", "script2.js"],
       "css": ["style1.css", "style2.css", "style2.css"]
     },
diff --git a/chrome/test/data/extensions/good/Extensions/bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0/manifest.json b/chrome/test/data/extensions/good/Extensions/bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0/manifest.json
index 08721e8..d87557c 100644
--- a/chrome/test/data/extensions/good/Extensions/bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0/manifest.json
+++ b/chrome/test/data/extensions/good/Extensions/bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0/manifest.json
@@ -6,7 +6,7 @@
   "permissions": ["tabs"],
   "content_scripts": [
     {
-      "matches": ["file://*"],
+      "matches": ["http://localhost/*"],
       "js": ["page.js"]
     }
   ]
diff --git a/chrome/test/data/extensions/good/Preferences b/chrome/test/data/extensions/good/Preferences
index 42a2713..85bdee3 100644
--- a/chrome/test/data/extensions/good/Preferences
+++ b/chrome/test/data/extensions/good/Preferences
@@ -26,7 +26,7 @@
               "permissions": ["tabs", "http://*.google.com/*", "https://*.google.com/*"],
               "content_scripts": [
                 {
-                  "matches": ["file://*", "http://*.google.com/*", "https://*.google.com/*"],
+                  "matches": ["http://*.google.com/*", "https://*.google.com/*", "http://localhost/*"],
                   "js": ["script1.js", "script2.js"],
                   "css": ["style1.css", "style2.css", "style2.css"]
                 },
@@ -50,7 +50,7 @@
               "permissions": ["tabs"],
               "content_scripts": [
                 {
-                  "matches": ["file://*"],
+                  "matches": ["http://localhost/*"],
                   "js": ["page.js"]
                 }
               ]
diff --git a/chrome/test/data/extensions/profiles/content_scripts1/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts1/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json
index 56fdb6c..56597f2 100755
--- a/chrome/test/data/extensions/profiles/content_scripts1/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json
+++ b/chrome/test/data/extensions/profiles/content_scripts1/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json
@@ -3,6 +3,6 @@
   "version": "1.0.0.0",
   "name": "1 content script",
   "content_scripts": [
-    { "matches": ["file://*"], "js": ["script.js"] }
+    { "matches": ["http://*/*"], "js": ["script.js"] }
   ]
 }
diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ahbojlbmpfcbogfblmekncilheldhjga/1.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ahbojlbmpfcbogfblmekncilheldhjga/1.0/manifest.json
index ebb23bbd..7f8e56c 100644
--- a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ahbojlbmpfcbogfblmekncilheldhjga/1.0/manifest.json
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ahbojlbmpfcbogfblmekncilheldhjga/1.0/manifest.json
@@ -1,10 +1,10 @@
-{

-   "content_scripts": [ {

-      "js": [ "script.js" ],

-      "matches": [ "file://*", "http://*/*" ]

-   } ],

-   "description": "test10",

-   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCJc5hNAjdKE1Rf/xYR7qkCRqoHDqZ69XRNh0NkYvir4XGlE7uqg7x2EhilkXqeoEmGJdqBYH601CgfRK0bmDbF+zlGvgW20ld4pmhWlBjZBi7ZoqLRK4UkBC7EFnIdxVHb+rQtEYK+1nTzX6WKMaNtPKjs2oTRMchZdpDyLRhmaQIDAQAB",

-   "name": "test10",

-   "version": "1.0"

-}

+{
+   "content_scripts": [ {
+      "js": [ "script.js" ],
+      "matches": [ "http://*/*" ]
+   } ],
+   "description": "test10",
+   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCJc5hNAjdKE1Rf/xYR7qkCRqoHDqZ69XRNh0NkYvir4XGlE7uqg7x2EhilkXqeoEmGJdqBYH601CgfRK0bmDbF+zlGvgW20ld4pmhWlBjZBi7ZoqLRK4UkBC7EFnIdxVHb+rQtEYK+1nTzX6WKMaNtPKjs2oTRMchZdpDyLRhmaQIDAQAB",
+   "name": "test10",
+   "version": "1.0"
+}
diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/coomonpcecmahbfkifeohkbgicpcfdgf/1.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/coomonpcecmahbfkifeohkbgicpcfdgf/1.0/manifest.json
index a325a89..f40f296 100644
--- a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/coomonpcecmahbfkifeohkbgicpcfdgf/1.0/manifest.json
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/coomonpcecmahbfkifeohkbgicpcfdgf/1.0/manifest.json
@@ -1,10 +1,10 @@
-{

-   "content_scripts": [ {

-      "js": [ "script.js" ],

-      "matches": [ "file://*", "http://*/*" ]

-   } ],

-   "description": "test1",

-   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbg9bDLfP2MkNebiYmIIrmP8TKyGR/a1Ul26PYbj/6UCvUN5aVZfZKKH8S7FEp3vCunIOF8h+JPugcMmJRTOhylqEjIAJBWI6CgljgS1CfGnHraeixrfRL6odFKqTc+cQr/TwlCGpK5qjtczX4LsJGRmxKA6upm+B81m8AiAUMJQIDAQAB",

-   "name": "test1",

-   "version": "1.0"

-}

+{
+   "content_scripts": [ {
+      "js": [ "script.js" ],
+      "matches": [ "http://*/*" ]
+   } ],
+   "description": "test1",
+   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbg9bDLfP2MkNebiYmIIrmP8TKyGR/a1Ul26PYbj/6UCvUN5aVZfZKKH8S7FEp3vCunIOF8h+JPugcMmJRTOhylqEjIAJBWI6CgljgS1CfGnHraeixrfRL6odFKqTc+cQr/TwlCGpK5qjtczX4LsJGRmxKA6upm+B81m8AiAUMJQIDAQAB",
+   "name": "test1",
+   "version": "1.0"
+}
diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/dhminefdpfgdedodgdilagiencggdcpm/1.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/dhminefdpfgdedodgdilagiencggdcpm/1.0/manifest.json
index 80ba6292..e80e576 100644
--- a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/dhminefdpfgdedodgdilagiencggdcpm/1.0/manifest.json
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/dhminefdpfgdedodgdilagiencggdcpm/1.0/manifest.json
@@ -1,10 +1,10 @@
-{

-   "content_scripts": [ {

-      "js": [ "script.js" ],

-      "matches": [ "file://*", "http://*/*" ]

-   } ],

-   "description": "test7",

-   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9D6Byfx1I8upJ+M2KXJZU6Evgm3VgvFFfmxJI65i5glm/trQujqBPU+BxiD4OZPX23Fas4wLsDkc0zN/NV04irgeVKlbslg5giojeWzJgenmLvpcw5CDP+tTgIpWV207nuVpqG2kdrP2zx8vgaSUuVUdIUF5mrbdHkYjnXkFzXwIDAQAB",

-   "name": "test7",

-   "version": "1.0"

-}

+{
+   "content_scripts": [ {
+      "js": [ "script.js" ],
+      "matches": [ "http://*/*" ]
+   } ],
+   "description": "test7",
+   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9D6Byfx1I8upJ+M2KXJZU6Evgm3VgvFFfmxJI65i5glm/trQujqBPU+BxiD4OZPX23Fas4wLsDkc0zN/NV04irgeVKlbslg5giojeWzJgenmLvpcw5CDP+tTgIpWV207nuVpqG2kdrP2zx8vgaSUuVUdIUF5mrbdHkYjnXkFzXwIDAQAB",
+   "name": "test7",
+   "version": "1.0"
+}
diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/kgfhjcinicjnlcbnbacbkbjdbafnlckn/1.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/kgfhjcinicjnlcbnbacbkbjdbafnlckn/1.0/manifest.json
index 25293e9..fc6c9e7 100644
--- a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/kgfhjcinicjnlcbnbacbkbjdbafnlckn/1.0/manifest.json
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/kgfhjcinicjnlcbnbacbkbjdbafnlckn/1.0/manifest.json
@@ -1,10 +1,10 @@
-{

-   "content_scripts": [ {

-      "js": [ "script.js" ],

-      "matches": [ "file://*", "http://*/*" ]

-   } ],

-   "description": "test9",

-   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2t6hjZyu4jS8UIHLxJMZoxAWDULi7PGC8pmA9LLe9NiDWG5UB68Se7olodYE/4fvuEc4r7JM1guz3r8FDvgZ+djxMXsldY5A683PxNpGEJf1bZfqDb2xUX4LlKgcNFcwMZpAza2BPZu+OlcIX/n9XodgP4+e55A3IxeuMIs5uKQIDAQAB",

-   "name": "test9",

-   "version": "1.0"

-}

+{
+   "content_scripts": [ {
+      "js": [ "script.js" ],
+      "matches": [ "http://*/*" ]
+   } ],
+   "description": "test9",
+   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2t6hjZyu4jS8UIHLxJMZoxAWDULi7PGC8pmA9LLe9NiDWG5UB68Se7olodYE/4fvuEc4r7JM1guz3r8FDvgZ+djxMXsldY5A683PxNpGEJf1bZfqDb2xUX4LlKgcNFcwMZpAza2BPZu+OlcIX/n9XodgP4+e55A3IxeuMIs5uKQIDAQAB",
+   "name": "test9",
+   "version": "1.0"
+}
diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ledhkldokbafdcbmepdigjmkabmombel/1.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ledhkldokbafdcbmepdigjmkabmombel/1.0/manifest.json
index 8e18a65..fa5db2c 100644
--- a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ledhkldokbafdcbmepdigjmkabmombel/1.0/manifest.json
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ledhkldokbafdcbmepdigjmkabmombel/1.0/manifest.json
@@ -1,10 +1,10 @@
-{

-   "content_scripts": [ {

-      "js": [ "script.js" ],

-      "matches": [ "file://*", "http://*/*" ]

-   } ],

-   "description": "test4",

-   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8VBNzk/hJkrU1xOU5c7JLJfMs379GV2bl7IqnbeofUNUCWjRhi65bX/snHCdnRam1leS2dXESiBAW2+hP7BsIeQvlIM+TVUNOJrVtIhOl7QSQh1WlI00lif5nM9hi2F4sLmGpCpI83WkJjUuuoY+0U9XTJkInY2JU8WTZvEXpeQIDAQAB",

-   "name": "test4",

-   "version": "1.0"

-}

+{
+   "content_scripts": [ {
+      "js": [ "script.js" ],
+      "matches": [ "http://*/*" ]
+   } ],
+   "description": "test4",
+   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8VBNzk/hJkrU1xOU5c7JLJfMs379GV2bl7IqnbeofUNUCWjRhi65bX/snHCdnRam1leS2dXESiBAW2+hP7BsIeQvlIM+TVUNOJrVtIhOl7QSQh1WlI00lif5nM9hi2F4sLmGpCpI83WkJjUuuoY+0U9XTJkInY2JU8WTZvEXpeQIDAQAB",
+   "name": "test4",
+   "version": "1.0"
+}
diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/lgmapeiimomfdbfphldobhhpoaoafaci/1.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/lgmapeiimomfdbfphldobhhpoaoafaci/1.0/manifest.json
index 7bfe9d3..5d9d019 100644
--- a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/lgmapeiimomfdbfphldobhhpoaoafaci/1.0/manifest.json
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/lgmapeiimomfdbfphldobhhpoaoafaci/1.0/manifest.json
@@ -1,10 +1,10 @@
-{

-   "content_scripts": [ {

-      "js": [ "script.js" ],

-      "matches": [ "file://*", "http://*/*" ]

-   } ],

-   "description": "test3",

-   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDVvOzMOzU9zxnpj+nQUcWVdW76rYlfVaDWYmOgoNrXN2C1WsB6GE+nxsjGgA3t2AP5M9Vwq9b3CCI5CCHEzWaZGGQ7qrSidU2gosNUb8n7O3K95BnqMOdrIlnN2/Z5POdfjGRN2BNpSdQ8UVjD8wZPJ7E7JIFdizGz70TV6lMNyQIDAQAB",

-   "name": "test3",

-   "version": "1.0"

-}

+{
+   "content_scripts": [ {
+      "js": [ "script.js" ],
+      "matches": [ "http://*/*" ]
+   } ],
+   "description": "test3",
+   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDVvOzMOzU9zxnpj+nQUcWVdW76rYlfVaDWYmOgoNrXN2C1WsB6GE+nxsjGgA3t2AP5M9Vwq9b3CCI5CCHEzWaZGGQ7qrSidU2gosNUb8n7O3K95BnqMOdrIlnN2/Z5POdfjGRN2BNpSdQ8UVjD8wZPJ7E7JIFdizGz70TV6lMNyQIDAQAB",
+   "name": "test3",
+   "version": "1.0"
+}
diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/maemolkcfjifpmigoecmpfphmebnebpk/1.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/maemolkcfjifpmigoecmpfphmebnebpk/1.0/manifest.json
index f6b40f0..15ece5e 100644
--- a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/maemolkcfjifpmigoecmpfphmebnebpk/1.0/manifest.json
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/maemolkcfjifpmigoecmpfphmebnebpk/1.0/manifest.json
@@ -1,10 +1,10 @@
-{

-   "content_scripts": [ {

-      "js": [ "script.js" ],

-      "matches": [ "file://*", "http://*/*" ]

-   } ],

-   "description": "test2",

-   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2nUfTHAG9rZ14Vq+JCUCU6OxuCkQ+Q6s6RA2h+mnJL8op4IBdOqZN038lmsl2rFhKz1rP/YPS4AP/LyiTfqL8e12GLw4nm71AM/LqeATzfFrvcFYCXy75ewhmBoOHMGQNe8JfaZ+0baUP7DnUiag91GiRmuAbqQGxLhdU6Qp3+wIDAQAB",

-   "name": "test2",

-   "version": "1.0"

-}

+{
+   "content_scripts": [ {
+      "js": [ "script.js" ],
+      "matches": [ "http://*/*" ]
+   } ],
+   "description": "test2",
+   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2nUfTHAG9rZ14Vq+JCUCU6OxuCkQ+Q6s6RA2h+mnJL8op4IBdOqZN038lmsl2rFhKz1rP/YPS4AP/LyiTfqL8e12GLw4nm71AM/LqeATzfFrvcFYCXy75ewhmBoOHMGQNe8JfaZ+0baUP7DnUiag91GiRmuAbqQGxLhdU6Qp3+wIDAQAB",
+   "name": "test2",
+   "version": "1.0"
+}
diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/mdeggakgacjccnbfbhbihfchoidihkaf/1.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/mdeggakgacjccnbfbhbihfchoidihkaf/1.0/manifest.json
index c5e5e16..4d2fc82 100644
--- a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/mdeggakgacjccnbfbhbihfchoidihkaf/1.0/manifest.json
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/mdeggakgacjccnbfbhbihfchoidihkaf/1.0/manifest.json
@@ -1,10 +1,10 @@
-{

-   "content_scripts": [ {

-      "js": [ "script.js" ],

-      "matches": [ "file://*", "http://*/*" ]

-   } ],

-   "description": "test8",

-   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCuuuaBElvU9XfeQLZ+w7YijIjQ/UOtUCzPApLZ1jurBC2BtTKVffL/ZzBEjGeYJZGqrbYeXxoIuM++UlWTGwxeOhGyO3zE0qgqlx9C8ufgaFAXY+fnLXnsrN18UupRGesuvmBEfvI0Lgp0fMKgAFBd5AEwdsrTLqkNK0pkGelEHwIDAQAB",

-   "name": "test8",

-   "version": "1.0"

-}

+{
+   "content_scripts": [ {
+      "js": [ "script.js" ],
+      "matches": [ "http://*/*" ]
+   } ],
+   "description": "test8",
+   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCuuuaBElvU9XfeQLZ+w7YijIjQ/UOtUCzPApLZ1jurBC2BtTKVffL/ZzBEjGeYJZGqrbYeXxoIuM++UlWTGwxeOhGyO3zE0qgqlx9C8ufgaFAXY+fnLXnsrN18UupRGesuvmBEfvI0Lgp0fMKgAFBd5AEwdsrTLqkNK0pkGelEHwIDAQAB",
+   "name": "test8",
+   "version": "1.0"
+}
diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/mgonfebmjopdoipblbijejncibmgmcol/1.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/mgonfebmjopdoipblbijejncibmgmcol/1.0/manifest.json
index da1f2ee..09aef9b 100644
--- a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/mgonfebmjopdoipblbijejncibmgmcol/1.0/manifest.json
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/mgonfebmjopdoipblbijejncibmgmcol/1.0/manifest.json
@@ -1,10 +1,10 @@
-{

-   "content_scripts": [ {

-      "js": [ "script.js" ],

-      "matches": [ "file://*", "http://*/*" ]

-   } ],

-   "description": "test5",

-   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDEII3rgPbgU4VEmHo4aKRVVujGhBqg2vhKXqtWnS7Yw5OJWkzFFa/Yb9Tz3/3m6HIh7cVCPP8RG4Ssro6JEDPHCwJU8ILMcgZkKtzOOFt2bybQBmVc1cTEOkSIfS9ktQPANi7ljxOqqDelyB6uwhGe4VZ324f/e4TISMBA+ejgkwIDAQAB",

-   "name": "test5",

-   "version": "1.0"

-}

+{
+   "content_scripts": [ {
+      "js": [ "script.js" ],
+      "matches": [ "http://*/*" ]
+   } ],
+   "description": "test5",
+   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDEII3rgPbgU4VEmHo4aKRVVujGhBqg2vhKXqtWnS7Yw5OJWkzFFa/Yb9Tz3/3m6HIh7cVCPP8RG4Ssro6JEDPHCwJU8ILMcgZkKtzOOFt2bybQBmVc1cTEOkSIfS9ktQPANi7ljxOqqDelyB6uwhGe4VZ324f/e4TISMBA+ejgkwIDAQAB",
+   "name": "test5",
+   "version": "1.0"
+}
diff --git a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ohmmlgjlmaadhojogadklhlidfpdeoca/1.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ohmmlgjlmaadhojogadklhlidfpdeoca/1.0/manifest.json
index a284020..67c8190 100644
--- a/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ohmmlgjlmaadhojogadklhlidfpdeoca/1.0/manifest.json
+++ b/chrome/test/data/extensions/profiles/content_scripts10/Default/Extensions/ohmmlgjlmaadhojogadklhlidfpdeoca/1.0/manifest.json
@@ -1,10 +1,10 @@
-{

-   "content_scripts": [ {

-      "js": [ "script.js" ],

-      "matches": [ "file://*", "http://*/*" ]

-   } ],

-   "description": "test6",

-   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDH/GGfuKiHDPMppIwuuRndAchnsz2iH6up9e5s+W6gsHtus37rkUvbUnCkx+ThE5F4Fj/C/rMYwGgCLe30HowD5BocOM0PF50aeYotlH4uystL2Gj/U1oSuBt+Mqn/MuR9U8nQnFvcDQeyG/09iPwC2faj7/LNnu0rT+dtYk0GnQIDAQAB",

-   "name": "test6",

-   "version": "1.0"

-}

+{
+   "content_scripts": [ {
+      "js": [ "script.js" ],
+      "matches": [ "http://*/*" ]
+   } ],
+   "description": "test6",
+   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDH/GGfuKiHDPMppIwuuRndAchnsz2iH6up9e5s+W6gsHtus37rkUvbUnCkx+ThE5F4Fj/C/rMYwGgCLe30HowD5BocOM0PF50aeYotlH4uystL2Gj/U1oSuBt+Mqn/MuR9U8nQnFvcDQeyG/09iPwC2faj7/LNnu0rT+dtYk0GnQIDAQAB",
+   "name": "test6",
+   "version": "1.0"
+}
diff --git a/chrome/test/data/extensions/profiles/content_scripts50/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json b/chrome/test/data/extensions/profiles/content_scripts50/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json
index d1f993b..29f2dba 100755
--- a/chrome/test/data/extensions/profiles/content_scripts50/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json
+++ b/chrome/test/data/extensions/profiles/content_scripts50/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json
@@ -3,55 +3,55 @@
   "version": "1.0.0.0",
   "name": "50 content scripts",
   "content_scripts": [
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] },
-    { "matches": ["file://*"], "js": ["script.js"] }
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] },
+    { "matches": ["http://*/*"], "js": ["script.js"] }
   ]
 }
diff --git a/chrome/test/data/extensions/subscribe_page_action/manifest.json b/chrome/test/data/extensions/subscribe_page_action/manifest.json
index b1577d2..6dec439 100644
--- a/chrome/test/data/extensions/subscribe_page_action/manifest.json
+++ b/chrome/test/data/extensions/subscribe_page_action/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "RSS Subscription Extension",
   "description": "Adds one-click subscription to your toolbar",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "permissions": [
     "tabs",
     "http://*/*"
@@ -9,7 +9,7 @@
   "background_page": "background.html",
   "content_scripts": [
     {
-      "matches": ["http://*/*", "file://*.*"],
+      "matches": ["http://*/*"],
       "js": ["feed_finder.js"]
     }
   ],
diff --git a/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension1.json b/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension1.json
index eac2f95..c09e818 100644
--- a/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension1.json
+++ b/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension1.json
@@ -9,7 +9,7 @@
   "order": 2,
   "content_scripts": [
     {
-      "matches": ["file://*", "http://*.google.com/*", "https://*.google.com/*"],
+      "matches": ["http://*.google.com/*", "https://*.google.com/*", "http://localhost/*"],
       "js": ["script1.js", "script2.js"],
       "css": ["style1.css", "style2.css", "style2.css"]
     },
diff --git a/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension3.json b/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension3.json
index 9235392..bbf69cd 100644
--- a/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension3.json
+++ b/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension3.json
@@ -9,7 +9,7 @@
   "order": 2,
   "content_scripts": [
     {
-      "matches": ["file://*"],
+      "matches": ["http://localhost/*"],
       "js": ["page.js"]
     }
   ],
diff --git a/chrome/test/page_cycler/page_cycler_test.cc b/chrome/test/page_cycler/page_cycler_test.cc
index bd6eb77..ca804de 100644
--- a/chrome/test/page_cycler/page_cycler_test.cc
+++ b/chrome/test/page_cycler/page_cycler_test.cc
@@ -162,6 +162,9 @@ class PageCyclerTest : public UITest {
     // Expose garbage collection for the page cycler tests.
     launch_arguments_.AppendSwitchWithValue(switches::kJavaScriptFlags,
                                             L"--expose_gc");
+    // Page cycler tests need to run content scripts on file:// urls.
+    launch_arguments_.AppendSwitch(switches::kEnableJsOnFileUrls);
+
 #if defined(OS_MACOSX)
     static rlim_t initial_fd_limit = GetFileDescriptorLimit();
     fd_limit_ = initial_fd_limit;