| 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/path_service.h" | 5 #include "base/path_service.h" |
| 6 #include "base/test/test_timeouts.h" | 6 #include "base/test/test_timeouts.h" |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "chrome/browser/extensions/extension_browsertest.h" | 8 #include "chrome/browser/extensions/extension_browsertest.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 519 RUN_URLLOADER_SUBTESTS_3; | 519 RUN_URLLOADER_SUBTESTS_3; |
| 520 } | 520 } |
| 521 | 521 |
| 522 // Flaky on 32-bit linux bot; http://crbug.com/308906 | 522 // Flaky on 32-bit linux bot; http://crbug.com/308906 |
| 523 #if defined(OS_LINUX) && defined(ARCH_CPU_X86) | 523 #if defined(OS_LINUX) && defined(ARCH_CPU_X86) |
| 524 #define MAYBE_URLLoader_BasicFilePOST DISABLED_URLLoader_BasicFilePOST | 524 #define MAYBE_URLLoader_BasicFilePOST DISABLED_URLLoader_BasicFilePOST |
| 525 #else | 525 #else |
| 526 #define MAYBE_URLLoader_BasicFilePOST URLLoader_BasicFilePOST | 526 #define MAYBE_URLLoader_BasicFilePOST URLLoader_BasicFilePOST |
| 527 #endif | 527 #endif |
| 528 | 528 |
| 529 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, URLLoader0) { | 529 #if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER) |
| 530 // Flaky on Mac ASAN: http://crbug.com/437411. |
| 531 #define MAYBE_URLLoader0 DISABLED_URLLoader0 |
| 532 #else |
| 533 #define MAYBE_URLLoader0 URLLoader0 |
| 534 #endif |
| 535 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_URLLoader0) { |
| 530 RUN_URLLOADER_SUBTESTS_0; | 536 RUN_URLLOADER_SUBTESTS_0; |
| 531 } | 537 } |
| 532 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, URLLoader1) { | 538 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, URLLoader1) { |
| 533 RUN_URLLOADER_SUBTESTS_1; | 539 RUN_URLLOADER_SUBTESTS_1; |
| 534 } | 540 } |
| 535 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, URLLoader2) { | 541 #if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER) |
| 542 // Flaky on Mac ASAN: http://crbug.com/437411. |
| 543 #define MAYBE_URLLoader2 DISABLED_URLLoader2 |
| 544 #else |
| 545 #define MAYBE_URLLoader2 URLLoader2 |
| 546 #endif |
| 547 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_URLLoader2) { |
| 536 RUN_URLLOADER_SUBTESTS_2; | 548 RUN_URLLOADER_SUBTESTS_2; |
| 537 } | 549 } |
| 538 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, URLLoader3) { | 550 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, URLLoader3) { |
| 539 RUN_URLLOADER_SUBTESTS_3; | 551 RUN_URLLOADER_SUBTESTS_3; |
| 540 } | 552 } |
| 541 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, | 553 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, |
| 542 MAYBE_PNACL_NONSFI(URLLoader0)) { | 554 MAYBE_PNACL_NONSFI(URLLoader0)) { |
| 543 RUN_URLLOADER_SUBTESTS_0; | 555 RUN_URLLOADER_SUBTESTS_0; |
| 544 } | 556 } |
| 545 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, | 557 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, |
| (...skipping 861 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1407 IN_PROC_BROWSER_TEST_F(TransitionalNonSfiPackagedAppTest, | 1419 IN_PROC_BROWSER_TEST_F(TransitionalNonSfiPackagedAppTest, |
| 1408 MAYBE_PNACL_TRANSITIONAL_NONSFI(SuccessfulLoad)) { | 1420 MAYBE_PNACL_TRANSITIONAL_NONSFI(SuccessfulLoad)) { |
| 1409 RunTests("packaged_app"); | 1421 RunTests("packaged_app"); |
| 1410 } | 1422 } |
| 1411 | 1423 |
| 1412 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, SocketPermissions) { | 1424 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, SocketPermissions) { |
| 1413 RunTests("socket_permissions"); | 1425 RunTests("socket_permissions"); |
| 1414 } | 1426 } |
| 1415 | 1427 |
| 1416 #endif | 1428 #endif |
| OLD | NEW |