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 613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
624 LIST_TEST(FileIO_RequestOSFileHandle) \ | 624 LIST_TEST(FileIO_RequestOSFileHandle) \ |
625 LIST_TEST(FileIO_RequestOSFileHandleWithOpenExclusive) \ | 625 LIST_TEST(FileIO_RequestOSFileHandleWithOpenExclusive) \ |
626 LIST_TEST(FileIO_Mmap) \ | 626 LIST_TEST(FileIO_Mmap) \ |
627 ) | 627 ) |
628 | 628 |
629 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) | 629 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) |
630 // TODO(erg): linux_aura bringup: http://crbug.com/318961 | 630 // TODO(erg): linux_aura bringup: http://crbug.com/318961 |
631 #define MAYBE_FileIO DISABLED_FileIO | 631 #define MAYBE_FileIO DISABLED_FileIO |
632 #define MAYBE_FileIO_Private DISABLED_FileIO_Private | 632 #define MAYBE_FileIO_Private DISABLED_FileIO_Private |
633 #else | 633 #else |
634 // Flaky on Mac and Win. http://crbug.com/377599 | |
635 #if defined(OS_MACOSX) || defined(OS_WIN) | |
636 #define MAYBE_FileIO DISABLED_FileIO | |
637 #else | |
638 #define MAYBE_FileIO FileIO | 634 #define MAYBE_FileIO FileIO |
639 #endif // OS_MACOSX || OS_WIN | |
640 #define MAYBE_FileIO_Private FileIO_Private | 635 #define MAYBE_FileIO_Private FileIO_Private |
641 #endif | 636 #endif |
642 | 637 |
643 IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_FileIO) { | 638 IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_FileIO) { |
644 RUN_FILEIO_SUBTESTS; | 639 RUN_FILEIO_SUBTESTS; |
645 } | 640 } |
646 IN_PROC_BROWSER_TEST_F(PPAPIPrivateTest, MAYBE_FileIO_Private) { | 641 IN_PROC_BROWSER_TEST_F(PPAPIPrivateTest, MAYBE_FileIO_Private) { |
647 RUN_FILEIO_PRIVATE_SUBTESTS; | 642 RUN_FILEIO_PRIVATE_SUBTESTS; |
648 } | 643 } |
649 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FileIO) { | 644 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FileIO) { |
(...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1263 LIST_TEST(FlashDRM_GetHmonitor) | 1258 LIST_TEST(FlashDRM_GetHmonitor) |
1264 LIST_TEST(FlashDRM_GetVoucherFile)); | 1259 LIST_TEST(FlashDRM_GetVoucherFile)); |
1265 } | 1260 } |
1266 | 1261 |
1267 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1262 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
1268 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1263 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
1269 | 1264 |
1270 #if defined(OS_CHROMEOS) | 1265 #if defined(OS_CHROMEOS) |
1271 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1266 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
1272 #endif | 1267 #endif |
OLD | NEW |