| 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 707 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 718 LIST_TEST(FileIO_RequestOSFileHandle) \ | 718 LIST_TEST(FileIO_RequestOSFileHandle) \ |
| 719 LIST_TEST(FileIO_RequestOSFileHandleWithOpenExclusive) \ | 719 LIST_TEST(FileIO_RequestOSFileHandleWithOpenExclusive) \ |
| 720 LIST_TEST(FileIO_Mmap) \ | 720 LIST_TEST(FileIO_Mmap) \ |
| 721 ) | 721 ) |
| 722 | 722 |
| 723 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) | 723 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) |
| 724 // TODO(erg): linux_aura bringup: http://crbug.com/318961 | 724 // TODO(erg): linux_aura bringup: http://crbug.com/318961 |
| 725 #define MAYBE_FileIO DISABLED_FileIO | 725 #define MAYBE_FileIO DISABLED_FileIO |
| 726 #define MAYBE_FileIO_Private DISABLED_FileIO_Private | 726 #define MAYBE_FileIO_Private DISABLED_FileIO_Private |
| 727 #else | 727 #else |
| 728 // Flaky on Mac. http://crbug.com/377599 |
| 729 # if defined(OS_MACOSX) |
| 730 #define MAYBE_FileIO DISABLED_FileIO |
| 731 # else |
| 728 #define MAYBE_FileIO FileIO | 732 #define MAYBE_FileIO FileIO |
| 733 # endif // defined(OS_MACOSX) |
| 729 #define MAYBE_FileIO_Private FileIO_Private | 734 #define MAYBE_FileIO_Private FileIO_Private |
| 730 #endif | 735 #endif |
| 731 | 736 |
| 732 IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_FileIO) { | 737 IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_FileIO) { |
| 733 RUN_FILEIO_SUBTESTS; | 738 RUN_FILEIO_SUBTESTS; |
| 734 } | 739 } |
| 735 IN_PROC_BROWSER_TEST_F(PPAPIPrivateTest, MAYBE_FileIO_Private) { | 740 IN_PROC_BROWSER_TEST_F(PPAPIPrivateTest, MAYBE_FileIO_Private) { |
| 736 RUN_FILEIO_PRIVATE_SUBTESTS; | 741 RUN_FILEIO_PRIVATE_SUBTESTS; |
| 737 } | 742 } |
| 738 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FileIO) { | 743 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FileIO) { |
| (...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1363 LIST_TEST(FlashDRM_GetHmonitor) | 1368 LIST_TEST(FlashDRM_GetHmonitor) |
| 1364 LIST_TEST(FlashDRM_GetVoucherFile)); | 1369 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1365 } | 1370 } |
| 1366 | 1371 |
| 1367 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1372 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 1368 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1373 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| 1369 | 1374 |
| 1370 #if defined(OS_CHROMEOS) | 1375 #if defined(OS_CHROMEOS) |
| 1371 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1376 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
| 1372 #endif | 1377 #endif |
| OLD | NEW |