Chromium Code Reviews| Index: chrome/browser/extensions/extension_resource_request_policy_apitest.cc |
| diff --git a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc |
| index 7529adab305957141502bf137b8d152d569ce472..8a176a73ef10843628719fa2d4424aa9f18f2180 100644 |
| --- a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc |
| +++ b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc |
| @@ -16,6 +16,8 @@ class ExtensionResourceRequestPolicyTest : public ExtensionApiTest { |
| virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
| ExtensionApiTest::SetUpCommandLine(command_line); |
| command_line->AppendSwitch(switches::kAllowLegacyExtensionManifests); |
| + command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); |
| + command_line->AppendSwitch(switches::kEnablePlatformApps); |
| } |
| }; |
| @@ -193,6 +195,17 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, |
| L"window.domAutomationController.send(document.title)", |
| &result)); |
| EXPECT_EQ("Image failed to load", result); |
| + |
| + GURL nonaccessabile_cer_resource( |
| + test_server()->GetURL( |
| + "files/extensions/api_test/extension_resource_request_policy/" |
| + "web_accessible/nonaccessabile_chrome_resource_scheme.html")); |
|
Mihai Parparita -not on Chrome
2012/05/16 23:17:44
Typo ("nonaccessabile")
Peng
2012/05/17 14:49:57
Done.
|
| + ui_test_utils::NavigateToURL(browser(), nonaccessabile_cer_resource); |
| + ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( |
| + browser()->GetSelectedWebContents()->GetRenderViewHost(), L"", |
| + L"window.domAutomationController.send(document.title)", |
| + &result)); |
| + EXPECT_EQ("Loading CER:// failed.", result); |
| } |
| IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, Iframe) { |
| @@ -205,3 +218,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, Iframe) { |
| "extension_resource_request_policy/web_accessible", |
| "iframe.html")); |
| } |
| + |
| +#if defined(OS_WIN) |
|
Mihai Parparita -not on Chrome
2012/05/16 23:17:44
Why is this disabled on Windows?
Peng
2012/05/17 14:49:57
Done
|
| +#define MAYBE_ExtensionAccessibleResources DISABLED_ExtensionAccessibleResources |
| +#else |
| +#define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources |
| +#endif |
| +IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, |
| + MAYBE_ExtensionAccessibleResources) { |
| + ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_; |
| +} |