| 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 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 441 RunTestViaHTTP( \ | 441 RunTestViaHTTP( \ |
| 442 LIST_TEST(URLLoader_UntrustedHttpRequests) \ | 442 LIST_TEST(URLLoader_UntrustedHttpRequests) \ |
| 443 LIST_TEST(URLLoader_FollowURLRedirect) \ | 443 LIST_TEST(URLLoader_FollowURLRedirect) \ |
| 444 LIST_TEST(URLLoader_AuditURLRedirect) \ | 444 LIST_TEST(URLLoader_AuditURLRedirect) \ |
| 445 LIST_TEST(URLLoader_AbortCalls) \ | 445 LIST_TEST(URLLoader_AbortCalls) \ |
| 446 LIST_TEST(URLLoader_UntendedLoad) \ | 446 LIST_TEST(URLLoader_UntendedLoad) \ |
| 447 LIST_TEST(URLLoader_PrefetchBufferThreshold) \ | 447 LIST_TEST(URLLoader_PrefetchBufferThreshold) \ |
| 448 ) | 448 ) |
| 449 | 449 |
| 450 // 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. |
| 451 // XRequestedWithHeader isn't trusted per-se, but the header isn't provided |
| 452 // for NaCl and thus must be skipped. |
| 451 #define RUN_URLLOADER_TRUSTED_SUBTESTS \ | 453 #define RUN_URLLOADER_TRUSTED_SUBTESTS \ |
| 452 RunTestViaHTTP( \ | 454 RunTestViaHTTP( \ |
| 453 LIST_TEST(URLLoader_TrustedSameOriginRestriction) \ | 455 LIST_TEST(URLLoader_TrustedSameOriginRestriction) \ |
| 454 LIST_TEST(URLLoader_TrustedCrossOriginRequest) \ | 456 LIST_TEST(URLLoader_TrustedCrossOriginRequest) \ |
| 455 LIST_TEST(URLLoader_TrustedHttpRequests) \ | 457 LIST_TEST(URLLoader_TrustedHttpRequests) \ |
| 458 LIST_TEST(URLLoader_XRequestedWithHeader) \ |
| 456 ) | 459 ) |
| 457 | 460 |
| 458 IN_PROC_BROWSER_TEST_F(PPAPITest, URLLoader0) { | 461 IN_PROC_BROWSER_TEST_F(PPAPITest, URLLoader0) { |
| 459 RUN_URLLOADER_SUBTESTS_0; | 462 RUN_URLLOADER_SUBTESTS_0; |
| 460 } | 463 } |
| 461 IN_PROC_BROWSER_TEST_F(PPAPITest, URLLoader1) { | 464 IN_PROC_BROWSER_TEST_F(PPAPITest, URLLoader1) { |
| 462 RUN_URLLOADER_SUBTESTS_1; | 465 RUN_URLLOADER_SUBTESTS_1; |
| 463 } | 466 } |
| 464 IN_PROC_BROWSER_TEST_F(PPAPITest, URLLoader2) { | 467 IN_PROC_BROWSER_TEST_F(PPAPITest, URLLoader2) { |
| 465 RUN_URLLOADER_SUBTESTS_2; | 468 RUN_URLLOADER_SUBTESTS_2; |
| (...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1329 LIST_TEST(FlashDRM_GetHmonitor) | 1332 LIST_TEST(FlashDRM_GetHmonitor) |
| 1330 LIST_TEST(FlashDRM_GetVoucherFile)); | 1333 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1331 } | 1334 } |
| 1332 | 1335 |
| 1333 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1336 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 1334 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1337 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| 1335 | 1338 |
| 1336 #if defined(OS_CHROMEOS) | 1339 #if defined(OS_CHROMEOS) |
| 1337 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1340 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
| 1338 #endif | 1341 #endif |
| OLD | NEW |