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 "chrome/test/ppapi/ppapi_test.h" | 5 #include "chrome/test/ppapi/ppapi_test.h" |
6 | 6 |
7 #include "base/test/test_timeouts.h" | 7 #include "base/test/test_timeouts.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "chrome/browser/content_settings/host_content_settings_map.h" | 9 #include "chrome/browser/content_settings/host_content_settings_map.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
432 #define RUN_URLLOADER_NACL_SUBTESTS_2 \ | 432 #define RUN_URLLOADER_NACL_SUBTESTS_2 \ |
433 RunTestViaHTTP( \ | 433 RunTestViaHTTP( \ |
434 LIST_TEST(URLLoader_UntrustedSameOriginRestriction) \ | 434 LIST_TEST(URLLoader_UntrustedSameOriginRestriction) \ |
435 LIST_TEST(URLLoader_UntrustedCrossOriginRequest) \ | 435 LIST_TEST(URLLoader_UntrustedCrossOriginRequest) \ |
436 LIST_TEST(URLLoader_UntrustedJavascriptURLRestriction) \ | 436 LIST_TEST(URLLoader_UntrustedJavascriptURLRestriction) \ |
437 LIST_TEST(DISABLED_URLLoader_TrustedJavascriptURLRestriction) \ | 437 LIST_TEST(DISABLED_URLLoader_TrustedJavascriptURLRestriction) \ |
438 ) | 438 ) |
439 | 439 |
440 #define RUN_URLLOADER_SUBTESTS_3 \ | 440 #define RUN_URLLOADER_SUBTESTS_3 \ |
441 RunTestViaHTTP( \ | 441 RunTestViaHTTP( \ |
| 442 LIST_TEST(URLLoader_UntrustedHttpRequests) \ |
442 LIST_TEST(URLLoader_FollowURLRedirect) \ | 443 LIST_TEST(URLLoader_FollowURLRedirect) \ |
443 LIST_TEST(URLLoader_AuditURLRedirect) \ | 444 LIST_TEST(URLLoader_AuditURLRedirect) \ |
444 LIST_TEST(URLLoader_AbortCalls) \ | 445 LIST_TEST(URLLoader_AbortCalls) \ |
445 LIST_TEST(URLLoader_UntendedLoad) \ | 446 LIST_TEST(URLLoader_UntendedLoad) \ |
446 LIST_TEST(URLLoader_PrefetchBufferThreshold) \ | 447 LIST_TEST(URLLoader_PrefetchBufferThreshold) \ |
447 ) | 448 ) |
448 | 449 |
449 // TODO(yhirano): I remove this subtest from RUN_URLLOADER_SUBTESTS_3 | |
450 // in order to change the behavior in Blink. | |
451 // Restore the subtest once it is landed. | |
452 // LIST_TEST(URLLoader_UntrustedHttpRequests) | |
453 | |
454 // Note: we do not support Trusted APIs in NaCl, so these will be skipped. | 450 // Note: we do not support Trusted APIs in NaCl, so these will be skipped. |
455 #define RUN_URLLOADER_TRUSTED_SUBTESTS \ | 451 #define RUN_URLLOADER_TRUSTED_SUBTESTS \ |
456 RunTestViaHTTP( \ | 452 RunTestViaHTTP( \ |
457 LIST_TEST(URLLoader_TrustedSameOriginRestriction) \ | 453 LIST_TEST(URLLoader_TrustedSameOriginRestriction) \ |
458 LIST_TEST(URLLoader_TrustedCrossOriginRequest) \ | 454 LIST_TEST(URLLoader_TrustedCrossOriginRequest) \ |
459 LIST_TEST(URLLoader_TrustedHttpRequests) \ | 455 LIST_TEST(URLLoader_TrustedHttpRequests) \ |
460 ) | 456 ) |
461 | 457 |
462 IN_PROC_BROWSER_TEST_F(PPAPITest, URLLoader0) { | 458 IN_PROC_BROWSER_TEST_F(PPAPITest, URLLoader0) { |
463 RUN_URLLOADER_SUBTESTS_0; | 459 RUN_URLLOADER_SUBTESTS_0; |
(...skipping 886 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1350 LIST_TEST(FlashDRM_GetHmonitor) | 1346 LIST_TEST(FlashDRM_GetHmonitor) |
1351 LIST_TEST(FlashDRM_GetVoucherFile)); | 1347 LIST_TEST(FlashDRM_GetVoucherFile)); |
1352 } | 1348 } |
1353 | 1349 |
1354 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1350 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
1355 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1351 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
1356 | 1352 |
1357 #if defined(OS_CHROMEOS) | 1353 #if defined(OS_CHROMEOS) |
1358 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1354 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
1359 #endif | 1355 #endif |
OLD | NEW |