OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/logging.h" | 5 #include "base/logging.h" |
6 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
7 #include "chrome/browser/ui/browser.h" | 7 #include "chrome/browser/ui/browser.h" |
8 #include "chrome/browser/ui/browser_tabstrip.h" | 8 #include "chrome/browser/ui/browser_tabstrip.h" |
9 #include "chrome/common/chrome_switches.h" | 9 #include "chrome/common/chrome_switches.h" |
10 #include "chrome/test/base/ui_test_utils.h" | 10 #include "chrome/test/base/ui_test_utils.h" |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
210 "files/extensions/api_test/extension_resource_request_policy/" | 210 "files/extensions/api_test/extension_resource_request_policy/" |
211 "web_accessible/nonaccessible_chrome_resource_scheme.html")); | 211 "web_accessible/nonaccessible_chrome_resource_scheme.html")); |
212 ui_test_utils::NavigateToURL(browser(), nonaccessible_cer_resource); | 212 ui_test_utils::NavigateToURL(browser(), nonaccessible_cer_resource); |
213 ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( | 213 ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( |
214 chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", | 214 chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", |
215 L"window.domAutomationController.send(document.title)", | 215 L"window.domAutomationController.send(document.title)", |
216 &result)); | 216 &result)); |
217 EXPECT_EQ("Loading CER:// failed.", result); | 217 EXPECT_EQ("Loading CER:// failed.", result); |
218 } | 218 } |
219 | 219 |
| 220 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, |
| 221 WebAccessibleResourcesWithCSP) { |
| 222 std::string result; |
| 223 ASSERT_TRUE(test_server()->Start()); |
| 224 ASSERT_TRUE(LoadExtension(test_data_dir_ |
| 225 .AppendASCII("extension_resource_request_policy") |
| 226 .AppendASCII("web_accessible"))); |
| 227 |
| 228 GURL accessible_resource_with_csp( |
| 229 test_server()->GetURL( |
| 230 "files/extensions/api_test/extension_resource_request_policy/" |
| 231 "web_accessible/accessible_resource_with_csp.html")); |
| 232 ui_test_utils::NavigateToURL(browser(), accessible_resource_with_csp); |
| 233 ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( |
| 234 chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", |
| 235 L"window.domAutomationController.send(document.title)", |
| 236 &result)); |
| 237 EXPECT_EQ("Loaded", result); |
| 238 } |
| 239 |
220 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, Iframe) { | 240 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, Iframe) { |
221 // Load another extension, which the test one shouldn't be able to get | 241 // Load another extension, which the test one shouldn't be able to get |
222 // resources from. | 242 // resources from. |
223 ASSERT_TRUE(LoadExtension(test_data_dir_ | 243 ASSERT_TRUE(LoadExtension(test_data_dir_ |
224 .AppendASCII("extension_resource_request_policy") | 244 .AppendASCII("extension_resource_request_policy") |
225 .AppendASCII("inaccessible"))); | 245 .AppendASCII("inaccessible"))); |
226 EXPECT_TRUE(RunExtensionSubtest( | 246 EXPECT_TRUE(RunExtensionSubtest( |
227 "extension_resource_request_policy/web_accessible", | 247 "extension_resource_request_policy/web_accessible", |
228 "iframe.html")); | 248 "iframe.html")); |
229 } | 249 } |
230 | 250 |
231 #if defined(OS_MACOSX) | 251 #if defined(OS_MACOSX) |
232 #define MAYBE_ExtensionAccessibleResources FLAKY_ExtensionAccessibleResources | 252 #define MAYBE_ExtensionAccessibleResources FLAKY_ExtensionAccessibleResources |
233 #else | 253 #else |
234 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources | 254 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources |
235 #endif | 255 #endif |
236 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, | 256 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, |
237 MAYBE_ExtensionAccessibleResources) { | 257 MAYBE_ExtensionAccessibleResources) { |
238 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_; | 258 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_; |
239 } | 259 } |
OLD | NEW |