| Index: chrome/test/ppapi/ppapi_browsertest.cc
|
| diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
|
| index 307d64578cb318fb10fca90f4ed6fb582821c08f..9f3187ea96887966694f94ba966250101d23d030 100644
|
| --- a/chrome/test/ppapi/ppapi_browsertest.cc
|
| +++ b/chrome/test/ppapi/ppapi_browsertest.cc
|
| @@ -612,7 +612,13 @@ TEST_PPAPI_NACL(VarResource)
|
| #undef PostMessage
|
| #endif
|
|
|
| -IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, PostMessage) {
|
| +#if defined(OS_WIN)
|
| +// http://crbug.com/95557
|
| +#define MAYBE_PostMessage DISABLED_PostMessage
|
| +#else
|
| +#define MAYBE_PostMessage PostMessage
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_PostMessage) {
|
| RUN_POSTMESSAGE_SUBTESTS;
|
| }
|
| IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, PostMessage) {
|
| @@ -1001,29 +1007,35 @@ IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_WebSocket1) {
|
| IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_WebSocket2) {
|
| RUN_WEBSOCKET_SUBTESTS_2;
|
| }
|
| +#if !defined(OS_WIN) // http://crbug.com/396399
|
| IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_WebSocket1) {
|
| RUN_WEBSOCKET_SUBTESTS_1;
|
| }
|
| -IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_WebSocket2) {
|
| - RUN_WEBSOCKET_SUBTESTS_2;
|
| -}
|
| IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket1) {
|
| RUN_WEBSOCKET_SUBTESTS_1;
|
| }
|
| -IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket2) {
|
| - RUN_WEBSOCKET_SUBTESTS_2;
|
| -}
|
| IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket1)) {
|
| RUN_WEBSOCKET_SUBTESTS_1;
|
| }
|
| -#if !defined(OS_WIN) // http://crbug.com/396363
|
| IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket2)) {
|
| RUN_WEBSOCKET_SUBTESTS_2;
|
| }
|
| -#endif
|
| IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, WebSocket1) {
|
| RUN_WEBSOCKET_SUBTESTS_1;
|
| }
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_WebSocket2) {
|
| + RUN_WEBSOCKET_SUBTESTS_2;
|
| +}
|
| +
|
| +IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket2) {
|
| + RUN_WEBSOCKET_SUBTESTS_2;
|
| +}
|
| +
|
| +IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket2)) {
|
| + RUN_WEBSOCKET_SUBTESTS_2;
|
| +}
|
| +
|
| // Flaky on XP Tests (3): http://crbug.com/389084
|
| #if defined(OS_WIN)
|
| #define MAYBE_WebSocket2 DISABLED_WebSocket2
|
| @@ -1269,7 +1281,8 @@ IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FlashMessageLoop) {
|
| TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor0, RUN_COMPOSITOR_SUBTESTS_0)
|
| TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor1, RUN_COMPOSITOR_SUBTESTS_1)
|
|
|
| -TEST_PPAPI_NACL(MediaStreamAudioTrack)
|
| +// http://crbug.com/396395
|
| +TEST_PPAPI_NACL(DISABLED_MediaStreamAudioTrack)
|
|
|
| TEST_PPAPI_NACL(MediaStreamVideoTrack)
|
|
|
|
|