Chromium Code Reviews| 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/logging.h" | 6 #include "base/logging.h" |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "chrome/browser/extensions/extension_apitest.h" | 8 #include "chrome/browser/extensions/extension_apitest.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| (...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 290 | 290 |
| 291 GURL accessible_resource_with_csp(embedded_test_server()->GetURL( | 291 GURL accessible_resource_with_csp(embedded_test_server()->GetURL( |
| 292 "/extensions/api_test/extension_resource_request_policy/" | 292 "/extensions/api_test/extension_resource_request_policy/" |
| 293 "web_accessible/accessible_resource_with_csp.html")); | 293 "web_accessible/accessible_resource_with_csp.html")); |
| 294 ui_test_utils::NavigateToURL(browser(), accessible_resource_with_csp); | 294 ui_test_utils::NavigateToURL(browser(), accessible_resource_with_csp); |
| 295 ASSERT_TRUE(content::ExecuteScriptAndExtractString( | 295 ASSERT_TRUE(content::ExecuteScriptAndExtractString( |
| 296 browser()->tab_strip_model()->GetActiveWebContents(), | 296 browser()->tab_strip_model()->GetActiveWebContents(), |
| 297 "window.domAutomationController.send(document.title)", | 297 "window.domAutomationController.send(document.title)", |
| 298 &result)); | 298 &result)); |
| 299 EXPECT_EQ("Loaded", result); | 299 EXPECT_EQ("Loaded", result); |
| 300 SetIgnoreCSPErrorMessages(true); | |
|
asargent_no_longer_on_chrome
2016/05/31 19:24:11
Please add a comment with a link to crbug.com/6161
wychen
2016/06/08 05:41:57
Done.
| |
| 300 } | 301 } |
| 301 | 302 |
| 302 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, Iframe) { | 303 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, Iframe) { |
| 303 // Load another extension, which the test one shouldn't be able to get | 304 // Load another extension, which the test one shouldn't be able to get |
| 304 // resources from. | 305 // resources from. |
| 305 ASSERT_TRUE(LoadExtension(test_data_dir_ | 306 ASSERT_TRUE(LoadExtension(test_data_dir_ |
| 306 .AppendASCII("extension_resource_request_policy") | 307 .AppendASCII("extension_resource_request_policy") |
| 307 .AppendASCII("inaccessible"))); | 308 .AppendASCII("inaccessible"))); |
| 308 EXPECT_TRUE(RunExtensionSubtest( | 309 EXPECT_TRUE(RunExtensionSubtest( |
| 309 "extension_resource_request_policy/web_accessible", | 310 "extension_resource_request_policy/web_accessible", |
| 310 "iframe.html")) << message_; | 311 "iframe.html")) << message_; |
| 311 } | 312 } |
| 312 | 313 |
| 313 #if defined(OS_MACOSX) | 314 #if defined(OS_MACOSX) |
| 314 #define MAYBE_ExtensionAccessibleResources DISABLED_ExtensionAccessibleResources | 315 #define MAYBE_ExtensionAccessibleResources DISABLED_ExtensionAccessibleResources |
| 315 #else | 316 #else |
| 316 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources | 317 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources |
| 317 #endif | 318 #endif |
| 318 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, | 319 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, |
| 319 MAYBE_ExtensionAccessibleResources) { | 320 MAYBE_ExtensionAccessibleResources) { |
| 320 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_; | 321 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_; |
| 321 } | 322 } |
| OLD | NEW |