Chromium Code Reviews| 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 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 568 // PPAPINaClTest.FileSystem times out consistently on Windows and Mac. | 568 // PPAPINaClTest.FileSystem times out consistently on Windows and Mac. |
| 569 // http://crbug.com/130372 | 569 // http://crbug.com/130372 |
| 570 #if defined(OS_MACOSX) || defined(OS_WIN) | 570 #if defined(OS_MACOSX) || defined(OS_WIN) |
| 571 #define MAYBE_FileSystem DISABLED_FileSystem | 571 #define MAYBE_FileSystem DISABLED_FileSystem |
| 572 #else | 572 #else |
| 573 #define MAYBE_FileSystem FileSystem | 573 #define MAYBE_FileSystem FileSystem |
| 574 #endif | 574 #endif |
| 575 | 575 |
| 576 TEST_PPAPI_NACL_VIA_HTTP(MAYBE_FileSystem) | 576 TEST_PPAPI_NACL_VIA_HTTP(MAYBE_FileSystem) |
| 577 | 577 |
| 578 // Mac/Aura reach NOTIMPLEMENTED/time out. | |
| 579 // Other systems work in-process, but flake out-of-process because of the | |
| 580 // asyncronous nature of the proxy. | |
| 581 // mac: http://crbug.com/96767 | |
| 582 // aura: http://crbug.com/104384 | |
| 583 // async flakiness: http://crbug.com/108471 | |
| 584 #if defined(OS_MACOSX) || defined(USE_AURA) | |
| 585 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen | |
| 586 #define MAYBE_OutOfProcessFlashFullscreen DISABLED_FlashFullscreen | |
| 587 #else | |
| 588 #define MAYBE_FlashFullscreen FlashFullscreen | |
| 589 #define MAYBE_OutOfProcessFlashFullscreen FlashFullscreen | |
| 590 #endif | |
| 591 | |
| 592 IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_FlashFullscreen) { | |
| 593 RunTestViaHTTP("FlashFullscreen"); | |
| 594 } | |
| 595 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_OutOfProcessFlashFullscreen) { | |
| 596 RunTestViaHTTP("FlashFullscreen"); | |
| 597 } | |
| 598 | |
| 599 #if defined(OS_MACOSX) | 578 #if defined(OS_MACOSX) |
| 600 // http://crbug.com/103912 | 579 // http://crbug.com/103912 |
| 601 #define MAYBE_Fullscreen DISABLED_Fullscreen | 580 #define MAYBE_Fullscreen DISABLED_Fullscreen |
| 602 #elif defined(OS_LINUX) | 581 #elif defined(OS_LINUX) |
| 603 // http://crbug.com/146008 | 582 // http://crbug.com/146008 |
| 604 #define MAYBE_Fullscreen DISABLED_Fullscreen | 583 #define MAYBE_Fullscreen DISABLED_Fullscreen |
| 605 #else | 584 #else |
| 606 #define MAYBE_Fullscreen Fullscreen | 585 #define MAYBE_Fullscreen Fullscreen |
| 607 #endif | 586 #endif |
| 608 | 587 |
| (...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 917 // - dmichael | 896 // - dmichael |
| 918 // MessageLoop_Post starts a thread so only run it if pepper threads are | 897 // MessageLoop_Post starts a thread so only run it if pepper threads are |
| 919 // enabled. | 898 // enabled. |
| 920 #ifdef ENABLE_PEPPER_THREADING | 899 #ifdef ENABLE_PEPPER_THREADING |
| 921 TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Post) | 900 TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Post) |
| 922 #endif | 901 #endif |
| 923 | 902 |
| 924 // Going forward, Flash APIs will only work out-of-process. | 903 // Going forward, Flash APIs will only work out-of-process. |
| 925 TEST_PPAPI_OUT_OF_PROCESS(FlashClipboard) | 904 TEST_PPAPI_OUT_OF_PROCESS(FlashClipboard) |
| 926 TEST_PPAPI_OUT_OF_PROCESS(FlashFile_CreateTemporaryFile) | 905 TEST_PPAPI_OUT_OF_PROCESS(FlashFile_CreateTemporaryFile) |
| 906 // Mac/Aura reach NOTIMPLEMENTED/time out. | |
| 907 // Other systems flake out-of-process because of the asyncronous nature of the | |
| 908 // proxy. | |
| 909 // mac: http://crbug.com/96767 | |
| 910 // aura: http://crbug.com/104384 | |
| 911 // async flakiness: http://crbug.com/108471 | |
|
dmichael (off chromium)
2012/11/27 20:58:01
It looks like this bug is fixed; can you remove th
raymes
2012/11/27 21:24:28
Done.
| |
| 912 #if defined(OS_MACOSX) || defined(USE_AURA) | |
| 913 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen | |
| 914 #else | |
| 915 #define MAYBE_FlashFullscreen FlashFullscreen | |
| 916 #endif | |
| 917 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_FlashFullscreen) | |
| 927 | 918 |
| 928 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 919 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 929 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 920 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| 930 | 921 |
| 931 #endif // ADDRESS_SANITIZER | 922 #endif // ADDRESS_SANITIZER |
| OLD | NEW |