summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extensions_service_unittest.cc
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 03:21:13 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 03:21:13 +0000
commit5f8681f6e104c322166e4bb860e242a86a601e13 (patch)
treed8e1516961fc938178e46ebdc2df9e7d5458a67c /chrome/browser/extensions/extensions_service_unittest.cc
parenta3d46f7e58274fc65cb89628a8e89fc49bca2750 (diff)
downloadchromium_src-5f8681f6e104c322166e4bb860e242a86a601e13.zip
chromium_src-5f8681f6e104c322166e4bb860e242a86a601e13.tar.gz
chromium_src-5f8681f6e104c322166e4bb860e242a86a601e13.tar.bz2
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
Diffstat (limited to 'chrome/browser/extensions/extensions_service_unittest.cc')
-rw-r--r--chrome/browser/extensions/extensions_service_unittest.cc6
1 files changed, 3 insertions, 3 deletions
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(),