| 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 "chrome/browser/extensions/extension_apitest.h" | 7 #include "chrome/browser/extensions/extension_apitest.h" |
| 8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 9 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 10 #include "chrome/test/base/test_switches.h" | 10 #include "chrome/test/base/test_switches.h" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 // can make sure it works end-to-end. | 29 // can make sure it works end-to-end. |
| 30 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) { | 30 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) { |
| 31 #if defined(OS_WIN) && defined(USE_ASH) | 31 #if defined(OS_WIN) && defined(USE_ASH) |
| 32 // Disable this test in Metro+Ash for now (http://crbug.com/262796). | 32 // Disable this test in Metro+Ash for now (http://crbug.com/262796). |
| 33 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 33 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 34 switches::kAshBrowserTests)) | 34 switches::kAshBrowserTests)) |
| 35 return; | 35 return; |
| 36 #endif | 36 #endif |
| 37 | 37 |
| 38 host_resolver()->AddRule("*", "127.0.0.1"); | 38 host_resolver()->AddRule("*", "127.0.0.1"); |
| 39 ASSERT_TRUE(test_server()->Start()); | 39 ASSERT_TRUE(embedded_test_server()->Start()); |
| 40 ASSERT_TRUE(LoadExtensionWithFlags(test_data_dir_ | 40 ASSERT_TRUE(LoadExtensionWithFlags(test_data_dir_ |
| 41 .AppendASCII("extension_resource_request_policy") | 41 .AppendASCII("extension_resource_request_policy") |
| 42 .AppendASCII("extension"), | 42 .AppendASCII("extension"), |
| 43 // Tests manifest_version 1 behavior, so warnings are expected. | 43 // Tests manifest_version 1 behavior, so warnings are expected. |
| 44 ExtensionBrowserTest::kFlagIgnoreManifestWarnings)); | 44 ExtensionBrowserTest::kFlagIgnoreManifestWarnings)); |
| 45 | 45 |
| 46 GURL web_resource( | 46 GURL web_resource(embedded_test_server()->GetURL( |
| 47 test_server()->GetURL( | 47 "/extensions/api_test/extension_resource_request_policy/" |
| 48 "files/extensions/api_test/extension_resource_request_policy/" | 48 "index.html")); |
| 49 "index.html")); | |
| 50 | 49 |
| 51 GURL::Replacements make_host_a_com; | 50 GURL::Replacements make_host_a_com; |
| 52 make_host_a_com.SetHostStr("a.com"); | 51 make_host_a_com.SetHostStr("a.com"); |
| 53 | 52 |
| 54 GURL::Replacements make_host_b_com; | 53 GURL::Replacements make_host_b_com; |
| 55 make_host_b_com.SetHostStr("b.com"); | 54 make_host_b_com.SetHostStr("b.com"); |
| 56 | 55 |
| 57 // A web host that has permission. | 56 // A web host that has permission. |
| 58 ui_test_utils::NavigateToURL( | 57 ui_test_utils::NavigateToURL( |
| 59 browser(), web_resource.ReplaceComponents(make_host_a_com)); | 58 browser(), web_resource.ReplaceComponents(make_host_a_com)); |
| 60 std::string result; | 59 std::string result; |
| 61 ASSERT_TRUE(content::ExecuteScriptAndExtractString( | 60 ASSERT_TRUE(content::ExecuteScriptAndExtractString( |
| 62 browser()->tab_strip_model()->GetActiveWebContents(), | 61 browser()->tab_strip_model()->GetActiveWebContents(), |
| 63 "window.domAutomationController.send(document.title)", | 62 "window.domAutomationController.send(document.title)", |
| 64 &result)); | 63 &result)); |
| 65 EXPECT_EQ(result, "Loaded"); | 64 EXPECT_EQ(result, "Loaded"); |
| 66 | 65 |
| 67 // A web host that loads a non-existent extension. | 66 // A web host that loads a non-existent extension. |
| 68 GURL non_existent_extension( | 67 GURL non_existent_extension(embedded_test_server()->GetURL( |
| 69 test_server()->GetURL( | 68 "/extensions/api_test/extension_resource_request_policy/" |
| 70 "files/extensions/api_test/extension_resource_request_policy/" | 69 "non_existent_extension.html")); |
| 71 "non_existent_extension.html")); | |
| 72 ui_test_utils::NavigateToURL(browser(), non_existent_extension); | 70 ui_test_utils::NavigateToURL(browser(), non_existent_extension); |
| 73 ASSERT_TRUE(content::ExecuteScriptAndExtractString( | 71 ASSERT_TRUE(content::ExecuteScriptAndExtractString( |
| 74 browser()->tab_strip_model()->GetActiveWebContents(), | 72 browser()->tab_strip_model()->GetActiveWebContents(), |
| 75 "window.domAutomationController.send(document.title)", | 73 "window.domAutomationController.send(document.title)", |
| 76 &result)); | 74 &result)); |
| 77 EXPECT_EQ(result, "Image failed to load"); | 75 EXPECT_EQ(result, "Image failed to load"); |
| 78 | 76 |
| 79 // A data URL. Data URLs should always be able to load chrome-extension:// | 77 // A data URL. Data URLs should always be able to load chrome-extension:// |
| 80 // resources. | 78 // resources. |
| 81 std::string file_source; | 79 std::string file_source; |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 | 145 |
| 148 // This test times out regularly on win_rel trybots. See http://crbug.com/122154 | 146 // This test times out regularly on win_rel trybots. See http://crbug.com/122154 |
| 149 #if defined(OS_WIN) | 147 #if defined(OS_WIN) |
| 150 #define MAYBE_WebAccessibleResources DISABLED_WebAccessibleResources | 148 #define MAYBE_WebAccessibleResources DISABLED_WebAccessibleResources |
| 151 #else | 149 #else |
| 152 #define MAYBE_WebAccessibleResources WebAccessibleResources | 150 #define MAYBE_WebAccessibleResources WebAccessibleResources |
| 153 #endif | 151 #endif |
| 154 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, | 152 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, |
| 155 MAYBE_WebAccessibleResources) { | 153 MAYBE_WebAccessibleResources) { |
| 156 std::string result; | 154 std::string result; |
| 157 ASSERT_TRUE(test_server()->Start()); | 155 ASSERT_TRUE(embedded_test_server()->Start()); |
| 158 ASSERT_TRUE(LoadExtension(test_data_dir_ | 156 ASSERT_TRUE(LoadExtension(test_data_dir_ |
| 159 .AppendASCII("extension_resource_request_policy") | 157 .AppendASCII("extension_resource_request_policy") |
| 160 .AppendASCII("web_accessible"))); | 158 .AppendASCII("web_accessible"))); |
| 161 | 159 |
| 162 GURL accessible_resource( | 160 GURL accessible_resource(embedded_test_server()->GetURL( |
| 163 test_server()->GetURL( | 161 "/extensions/api_test/extension_resource_request_policy/" |
| 164 "files/extensions/api_test/extension_resource_request_policy/" | 162 "web_accessible/accessible_resource.html")); |
| 165 "web_accessible/accessible_resource.html")); | |
| 166 ui_test_utils::NavigateToURL(browser(), accessible_resource); | 163 ui_test_utils::NavigateToURL(browser(), accessible_resource); |
| 167 ASSERT_TRUE(content::ExecuteScriptAndExtractString( | 164 ASSERT_TRUE(content::ExecuteScriptAndExtractString( |
| 168 browser()->tab_strip_model()->GetActiveWebContents(), | 165 browser()->tab_strip_model()->GetActiveWebContents(), |
| 169 "window.domAutomationController.send(document.title)", | 166 "window.domAutomationController.send(document.title)", |
| 170 &result)); | 167 &result)); |
| 171 EXPECT_EQ("Loaded", result); | 168 EXPECT_EQ("Loaded", result); |
| 172 | 169 |
| 173 GURL xhr_accessible_resource( | 170 GURL xhr_accessible_resource(embedded_test_server()->GetURL( |
| 174 test_server()->GetURL( | 171 "/extensions/api_test/extension_resource_request_policy/" |
| 175 "files/extensions/api_test/extension_resource_request_policy/" | 172 "web_accessible/xhr_accessible_resource.html")); |
| 176 "web_accessible/xhr_accessible_resource.html")); | |
| 177 ui_test_utils::NavigateToURL( | 173 ui_test_utils::NavigateToURL( |
| 178 browser(), xhr_accessible_resource); | 174 browser(), xhr_accessible_resource); |
| 179 ASSERT_TRUE(content::ExecuteScriptAndExtractString( | 175 ASSERT_TRUE(content::ExecuteScriptAndExtractString( |
| 180 browser()->tab_strip_model()->GetActiveWebContents(), | 176 browser()->tab_strip_model()->GetActiveWebContents(), |
| 181 "window.domAutomationController.send(document.title)", | 177 "window.domAutomationController.send(document.title)", |
| 182 &result)); | 178 &result)); |
| 183 EXPECT_EQ("XHR completed with status: 200", result); | 179 EXPECT_EQ("XHR completed with status: 200", result); |
| 184 | 180 |
| 185 GURL xhr_inaccessible_resource( | 181 GURL xhr_inaccessible_resource(embedded_test_server()->GetURL( |
| 186 test_server()->GetURL( | 182 "/extensions/api_test/extension_resource_request_policy/" |
| 187 "files/extensions/api_test/extension_resource_request_policy/" | 183 "web_accessible/xhr_inaccessible_resource.html")); |
| 188 "web_accessible/xhr_inaccessible_resource.html")); | |
| 189 ui_test_utils::NavigateToURL( | 184 ui_test_utils::NavigateToURL( |
| 190 browser(), xhr_inaccessible_resource); | 185 browser(), xhr_inaccessible_resource); |
| 191 ASSERT_TRUE(content::ExecuteScriptAndExtractString( | 186 ASSERT_TRUE(content::ExecuteScriptAndExtractString( |
| 192 browser()->tab_strip_model()->GetActiveWebContents(), | 187 browser()->tab_strip_model()->GetActiveWebContents(), |
| 193 "window.domAutomationController.send(document.title)", | 188 "window.domAutomationController.send(document.title)", |
| 194 &result)); | 189 &result)); |
| 195 EXPECT_EQ("XHR failed to load resource", result); | 190 EXPECT_EQ("XHR failed to load resource", result); |
| 196 | 191 |
| 197 GURL nonaccessible_resource( | 192 GURL nonaccessible_resource(embedded_test_server()->GetURL( |
| 198 test_server()->GetURL( | 193 "/extensions/api_test/extension_resource_request_policy/" |
| 199 "files/extensions/api_test/extension_resource_request_policy/" | 194 "web_accessible/nonaccessible_resource.html")); |
| 200 "web_accessible/nonaccessible_resource.html")); | |
| 201 ui_test_utils::NavigateToURL(browser(), nonaccessible_resource); | 195 ui_test_utils::NavigateToURL(browser(), nonaccessible_resource); |
| 202 ASSERT_TRUE(content::ExecuteScriptAndExtractString( | 196 ASSERT_TRUE(content::ExecuteScriptAndExtractString( |
| 203 browser()->tab_strip_model()->GetActiveWebContents(), | 197 browser()->tab_strip_model()->GetActiveWebContents(), |
| 204 "window.domAutomationController.send(document.title)", | 198 "window.domAutomationController.send(document.title)", |
| 205 &result)); | 199 &result)); |
| 206 EXPECT_EQ("Image failed to load", result); | 200 EXPECT_EQ("Image failed to load", result); |
| 207 | 201 |
| 208 GURL nonexistent_resource( | 202 GURL nonexistent_resource(embedded_test_server()->GetURL( |
| 209 test_server()->GetURL( | 203 "/extensions/api_test/extension_resource_request_policy/" |
| 210 "files/extensions/api_test/extension_resource_request_policy/" | 204 "web_accessible/nonexistent_resource.html")); |
| 211 "web_accessible/nonexistent_resource.html")); | |
| 212 ui_test_utils::NavigateToURL(browser(), nonexistent_resource); | 205 ui_test_utils::NavigateToURL(browser(), nonexistent_resource); |
| 213 ASSERT_TRUE(content::ExecuteScriptAndExtractString( | 206 ASSERT_TRUE(content::ExecuteScriptAndExtractString( |
| 214 browser()->tab_strip_model()->GetActiveWebContents(), | 207 browser()->tab_strip_model()->GetActiveWebContents(), |
| 215 "window.domAutomationController.send(document.title)", | 208 "window.domAutomationController.send(document.title)", |
| 216 &result)); | 209 &result)); |
| 217 EXPECT_EQ("Image failed to load", result); | 210 EXPECT_EQ("Image failed to load", result); |
| 218 | 211 |
| 219 GURL nonaccessible_cer_resource( | 212 GURL nonaccessible_cer_resource(embedded_test_server()->GetURL( |
| 220 test_server()->GetURL( | 213 "/extensions/api_test/extension_resource_request_policy/" |
| 221 "files/extensions/api_test/extension_resource_request_policy/" | 214 "web_accessible/nonaccessible_chrome_resource_scheme.html")); |
| 222 "web_accessible/nonaccessible_chrome_resource_scheme.html")); | |
| 223 ui_test_utils::NavigateToURL(browser(), nonaccessible_cer_resource); | 215 ui_test_utils::NavigateToURL(browser(), nonaccessible_cer_resource); |
| 224 ASSERT_TRUE(content::ExecuteScriptAndExtractString( | 216 ASSERT_TRUE(content::ExecuteScriptAndExtractString( |
| 225 browser()->tab_strip_model()->GetActiveWebContents(), | 217 browser()->tab_strip_model()->GetActiveWebContents(), |
| 226 "window.domAutomationController.send(document.title)", | 218 "window.domAutomationController.send(document.title)", |
| 227 &result)); | 219 &result)); |
| 228 EXPECT_EQ("Loading CER:// failed.", result); | 220 EXPECT_EQ("Loading CER:// failed.", result); |
| 229 | 221 |
| 230 GURL newtab_page("chrome://newtab"); | 222 GURL newtab_page("chrome://newtab"); |
| 231 GURL accessible_newtab_override( | 223 GURL accessible_newtab_override(embedded_test_server()->GetURL( |
| 232 test_server()->GetURL( | 224 "/extensions/api_test/extension_resource_request_policy/" |
| 233 "files/extensions/api_test/extension_resource_request_policy/" | 225 "web_accessible/accessible_history_navigation.html")); |
| 234 "web_accessible/accessible_history_navigation.html")); | |
| 235 ui_test_utils::NavigateToURL(browser(), newtab_page); | 226 ui_test_utils::NavigateToURL(browser(), newtab_page); |
| 236 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( | 227 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( |
| 237 browser(), accessible_newtab_override, 2); | 228 browser(), accessible_newtab_override, 2); |
| 238 ASSERT_TRUE(content::ExecuteScriptAndExtractString( | 229 ASSERT_TRUE(content::ExecuteScriptAndExtractString( |
| 239 browser()->tab_strip_model()->GetActiveWebContents(), | 230 browser()->tab_strip_model()->GetActiveWebContents(), |
| 240 "window.domAutomationController.send(document.title)", | 231 "window.domAutomationController.send(document.title)", |
| 241 &result)); | 232 &result)); |
| 242 EXPECT_EQ("New Tab Page Loaded Successfully", result); | 233 EXPECT_EQ("New Tab Page Loaded Successfully", result); |
| 243 } | 234 } |
| 244 | 235 |
| 245 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, | 236 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, |
| 246 LinkToWebAccessibleResources) { | 237 LinkToWebAccessibleResources) { |
| 247 std::string result; | 238 std::string result; |
| 248 ASSERT_TRUE(test_server()->Start()); | 239 ASSERT_TRUE(embedded_test_server()->Start()); |
| 249 ASSERT_TRUE(LoadExtension(test_data_dir_ | 240 ASSERT_TRUE(LoadExtension(test_data_dir_ |
| 250 .AppendASCII("extension_resource_request_policy") | 241 .AppendASCII("extension_resource_request_policy") |
| 251 .AppendASCII("web_accessible"))); | 242 .AppendASCII("web_accessible"))); |
| 252 | 243 |
| 253 GURL accessible_linked_resource( | 244 GURL accessible_linked_resource(embedded_test_server()->GetURL( |
| 254 test_server()->GetURL( | 245 "/extensions/api_test/extension_resource_request_policy/" |
| 255 "files/extensions/api_test/extension_resource_request_policy/" | 246 "web_accessible/accessible_link_resource.html")); |
| 256 "web_accessible/accessible_link_resource.html")); | |
| 257 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), | 247 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), |
| 258 accessible_linked_resource, 2); | 248 accessible_linked_resource, 2); |
| 259 ASSERT_TRUE(content::ExecuteScriptAndExtractString( | 249 ASSERT_TRUE(content::ExecuteScriptAndExtractString( |
| 260 browser()->tab_strip_model()->GetActiveWebContents(), | 250 browser()->tab_strip_model()->GetActiveWebContents(), |
| 261 "window.domAutomationController.send(document.URL)", | 251 "window.domAutomationController.send(document.URL)", |
| 262 &result)); | 252 &result)); |
| 263 EXPECT_NE("about:blank", result); | 253 EXPECT_NE("about:blank", result); |
| 264 | 254 |
| 265 GURL nonaccessible_linked_resource( | 255 GURL nonaccessible_linked_resource(embedded_test_server()->GetURL( |
| 266 test_server()->GetURL( | 256 "/extensions/api_test/extension_resource_request_policy/" |
| 267 "files/extensions/api_test/extension_resource_request_policy/" | 257 "web_accessible/nonaccessible_link_resource.html")); |
| 268 "web_accessible/nonaccessible_link_resource.html")); | |
| 269 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), | 258 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), |
| 270 nonaccessible_linked_resource, 2); | 259 nonaccessible_linked_resource, 2); |
| 271 ASSERT_TRUE(content::ExecuteScriptAndExtractString( | 260 ASSERT_TRUE(content::ExecuteScriptAndExtractString( |
| 272 browser()->tab_strip_model()->GetActiveWebContents(), | 261 browser()->tab_strip_model()->GetActiveWebContents(), |
| 273 "window.domAutomationController.send(document.URL)", | 262 "window.domAutomationController.send(document.URL)", |
| 274 &result)); | 263 &result)); |
| 275 EXPECT_EQ("about:blank", result); | 264 EXPECT_EQ("about:blank", result); |
| 276 | 265 |
| 277 GURL accessible_client_redirect_resource( | 266 GURL accessible_client_redirect_resource(embedded_test_server()->GetURL( |
| 278 test_server()->GetURL( | 267 "/extensions/api_test/extension_resource_request_policy/" |
| 279 "files/extensions/api_test/extension_resource_request_policy/" | 268 "web_accessible/accessible_redirect_resource.html")); |
| 280 "web_accessible/accessible_redirect_resource.html")); | |
| 281 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), | 269 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), |
| 282 accessible_client_redirect_resource, 2); | 270 accessible_client_redirect_resource, 2); |
| 283 ASSERT_TRUE(content::ExecuteScriptAndExtractString( | 271 ASSERT_TRUE(content::ExecuteScriptAndExtractString( |
| 284 browser()->tab_strip_model()->GetActiveWebContents(), | 272 browser()->tab_strip_model()->GetActiveWebContents(), |
| 285 "window.domAutomationController.send(document.URL)", | 273 "window.domAutomationController.send(document.URL)", |
| 286 &result)); | 274 &result)); |
| 287 EXPECT_NE("about:blank", result); | 275 EXPECT_NE("about:blank", result); |
| 288 | 276 |
| 289 GURL nonaccessible_client_redirect_resource( | 277 GURL nonaccessible_client_redirect_resource(embedded_test_server()->GetURL( |
| 290 test_server()->GetURL( | 278 "/extensions/api_test/extension_resource_request_policy/" |
| 291 "files/extensions/api_test/extension_resource_request_policy/" | 279 "web_accessible/nonaccessible_redirect_resource.html")); |
| 292 "web_accessible/nonaccessible_redirect_resource.html")); | |
| 293 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), | 280 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), |
| 294 nonaccessible_client_redirect_resource, 2); | 281 nonaccessible_client_redirect_resource, 2); |
| 295 ASSERT_TRUE(content::ExecuteScriptAndExtractString( | 282 ASSERT_TRUE(content::ExecuteScriptAndExtractString( |
| 296 browser()->tab_strip_model()->GetActiveWebContents(), | 283 browser()->tab_strip_model()->GetActiveWebContents(), |
| 297 "window.domAutomationController.send(document.URL)", | 284 "window.domAutomationController.send(document.URL)", |
| 298 &result)); | 285 &result)); |
| 299 EXPECT_EQ("about:blank", result); | 286 EXPECT_EQ("about:blank", result); |
| 300 } | 287 } |
| 301 | 288 |
| 302 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, | 289 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, |
| 303 WebAccessibleResourcesWithCSP) { | 290 WebAccessibleResourcesWithCSP) { |
| 304 std::string result; | 291 std::string result; |
| 305 ASSERT_TRUE(test_server()->Start()); | 292 ASSERT_TRUE(embedded_test_server()->Start()); |
| 306 ASSERT_TRUE(LoadExtension(test_data_dir_ | 293 ASSERT_TRUE(LoadExtension(test_data_dir_ |
| 307 .AppendASCII("extension_resource_request_policy") | 294 .AppendASCII("extension_resource_request_policy") |
| 308 .AppendASCII("web_accessible"))); | 295 .AppendASCII("web_accessible"))); |
| 309 | 296 |
| 310 GURL accessible_resource_with_csp( | 297 GURL accessible_resource_with_csp(embedded_test_server()->GetURL( |
| 311 test_server()->GetURL( | 298 "/extensions/api_test/extension_resource_request_policy/" |
| 312 "files/extensions/api_test/extension_resource_request_policy/" | 299 "web_accessible/accessible_resource_with_csp.html")); |
| 313 "web_accessible/accessible_resource_with_csp.html")); | |
| 314 ui_test_utils::NavigateToURL(browser(), accessible_resource_with_csp); | 300 ui_test_utils::NavigateToURL(browser(), accessible_resource_with_csp); |
| 315 ASSERT_TRUE(content::ExecuteScriptAndExtractString( | 301 ASSERT_TRUE(content::ExecuteScriptAndExtractString( |
| 316 browser()->tab_strip_model()->GetActiveWebContents(), | 302 browser()->tab_strip_model()->GetActiveWebContents(), |
| 317 "window.domAutomationController.send(document.title)", | 303 "window.domAutomationController.send(document.title)", |
| 318 &result)); | 304 &result)); |
| 319 EXPECT_EQ("Loaded", result); | 305 EXPECT_EQ("Loaded", result); |
| 320 } | 306 } |
| 321 | 307 |
| 322 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, Iframe) { | 308 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, Iframe) { |
| 323 // Load another extension, which the test one shouldn't be able to get | 309 // Load another extension, which the test one shouldn't be able to get |
| 324 // resources from. | 310 // resources from. |
| 325 ASSERT_TRUE(LoadExtension(test_data_dir_ | 311 ASSERT_TRUE(LoadExtension(test_data_dir_ |
| 326 .AppendASCII("extension_resource_request_policy") | 312 .AppendASCII("extension_resource_request_policy") |
| 327 .AppendASCII("inaccessible"))); | 313 .AppendASCII("inaccessible"))); |
| 328 EXPECT_TRUE(RunExtensionSubtest( | 314 EXPECT_TRUE(RunExtensionSubtest( |
| 329 "extension_resource_request_policy/web_accessible", | 315 "extension_resource_request_policy/web_accessible", |
| 330 "iframe.html")) << message_; | 316 "iframe.html")) << message_; |
| 331 } | 317 } |
| 332 | 318 |
| 333 #if defined(OS_MACOSX) | 319 #if defined(OS_MACOSX) |
| 334 #define MAYBE_ExtensionAccessibleResources DISABLED_ExtensionAccessibleResources | 320 #define MAYBE_ExtensionAccessibleResources DISABLED_ExtensionAccessibleResources |
| 335 #else | 321 #else |
| 336 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources | 322 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources |
| 337 #endif | 323 #endif |
| 338 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, | 324 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, |
| 339 MAYBE_ExtensionAccessibleResources) { | 325 MAYBE_ExtensionAccessibleResources) { |
| 340 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_; | 326 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_; |
| 341 } | 327 } |
| OLD | NEW |