From 62771440ed73d5f6f8b322ad5f7a2fa1837e8da9 Mon Sep 17 00:00:00 2001 From: "aa@chromium.org" Date: Sun, 22 Nov 2009 02:25:04 +0000 Subject: Revert change that disallowed content scripts access to file:// URLs. It turns out teams were already depending on this and we didn't want to break them. Instead, group file:// access with NPAPI in the extension install prompt. Note: this is a pure revert of r402029 and r402069 (sorry Finnur!) except the changes in extension_install_ui.cc, which are new. BUG=28456 Review URL: http://codereview.chromium.org/430003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32770 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/extensions_service_unittest.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'chrome/browser/extensions/extensions_service_unittest.cc') diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc index 5024757..f9af689 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("http://*.google.com/*", + EXPECT_EQ("file://*", scripts[0].url_patterns()[0].GetAsString()); - EXPECT_EQ("https://*.google.com/*", + EXPECT_EQ("http://*.google.com/*", scripts[0].url_patterns()[1].GetAsString()); - EXPECT_EQ("http://localhost/*", + EXPECT_EQ("https://*.google.com/*", scripts[0].url_patterns()[2].GetAsString()); EXPECT_EQ(2u, scripts[0].js_scripts().size()); ExtensionResource resource00(scripts[0].js_scripts()[0].extension_root(), -- cgit v1.1