| Index: chrome/test/ui/ppapi_uitest.cc
|
| diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc
|
| index 10e93c9d6176050c4f2fb976c885472525bc6817..2b9b0566afb02106bf180ca57897f4796c369bc9 100644
|
| --- a/chrome/test/ui/ppapi_uitest.cc
|
| +++ b/chrome/test/ui/ppapi_uitest.cc
|
| @@ -251,12 +251,19 @@ TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileRef)
|
| TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem)
|
| TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileSystem)
|
|
|
| -// http://crbug.com/96767
|
| -#if !defined(OS_MACOSX)
|
| -TEST_F(PPAPITest, FLAKY_FlashFullscreen) {
|
| +// http://crbug.com/96767 and 104384 for aura.
|
| +#if !defined(OS_MACOSX) && !defined(USE_AURA)
|
| +#define MAYBE_FlashFullscreen FLAKY_FlashFullscreen
|
| +#define MAYBE_FlashFullscreen FLAKY_FlashFullscreen
|
| +#else
|
| +#define MAYBE_FlashFullscreen DISABLED_FlashFullscreen
|
| +#define MAYBE_FlashFullscreen DISABLED_FlashFullscreen
|
| +#endif
|
| +
|
| +TEST_F(PPAPITest, MAYBE_FlashFullscreen) {
|
| RunTestViaHTTP("FlashFullscreen");
|
| }
|
| -TEST_F(OutOfProcessPPAPITest, FLAKY_FlashFullscreen) {
|
| +TEST_F(OutOfProcessPPAPITest, MAYBE_FlashFullscreen) {
|
| RunTestViaHTTP("FlashFullscreen");
|
| }
|
| // New implementation only honors fullscreen requests within a context of
|
| @@ -272,7 +279,6 @@ TEST_F(PPAPITest, DISABLED_Fullscreen) {
|
| TEST_F(OutOfProcessPPAPITest, DISABLED_Fullscreen) {
|
| RunTestViaHTTP("Fullscreen");
|
| }
|
| -#endif
|
|
|
| TEST_PPAPI_IN_PROCESS(FlashClipboard)
|
| TEST_PPAPI_OUT_OF_PROCESS(FlashClipboard)
|
|
|