summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-10 22:33:06 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-10 22:33:06 +0000
commit133bf5be612e082d10a96e995c61827613a0d3d3 (patch)
tree292036a96bb17f2630bcd690edd6054a5c7d53f1 /chrome/browser/extensions
parentb3907eb253738b88078f3ca6643c281ebe9f3a03 (diff)
downloadchromium_src-133bf5be612e082d10a96e995c61827613a0d3d3.zip
chromium_src-133bf5be612e082d10a96e995c61827613a0d3d3.tar.gz
chromium_src-133bf5be612e082d10a96e995c61827613a0d3d3.tar.bz2
Temporarily disable restrictions on who can request chrome-extension://.
These checks were causing lots of subtle bugs and fixing them will be difficult to get correct for the upcoming milestone. The checks were originally intended to be an 'extra line of defense' and are not critical for security. I will reintroduce them separately on trunk. BUG=72455,72407 Review URL: http://codereview.chromium.org/6478019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_resource_request_policy_apitest.cc13
1 files changed, 8 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc
index d9b371d..f6f14ab 100644
--- a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc
+++ b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc
@@ -46,13 +46,16 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) {
&result));
EXPECT_EQ(result, "Loaded");
- // A web host that does not have permission.
- ui_test_utils::NavigateToURL(
- browser(), web_resource.ReplaceComponents(make_host_b_com));
+ // A web host that loads a non-existent extension.
+ GURL non_existent_extension(
+ test_server()->GetURL(
+ "files/extensions/api_test/extension_resource_request_policy/"
+ "non_existent_extension.html"));
+ ui_test_utils::NavigateToURL(browser(), non_existent_extension);
ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(
- browser()->GetSelectedTabContents()->render_view_host(), L"",
+ browser()->GetSelectedTabContents()->render_view_host(), L"",
L"window.domAutomationController.send(document.title)",
- &result));
+ &result));
EXPECT_EQ(result, "Image failed to load");
// A data URL. Data URLs should always be able to load chrome-extension://