Index: chrome/test/ui/ppapi_uitest.cc |
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc |
index 83ff2514ab2473f157ef4f28b56902e6094ac10b..4d90ac93fe020fb5511e81380828d20db5918177 100644 |
--- a/chrome/test/ui/ppapi_uitest.cc |
+++ b/chrome/test/ui/ppapi_uitest.cc |
@@ -881,13 +881,6 @@ TEST_PPAPI_OUT_OF_PROCESS(Flash_MessageLoop) |
TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset) |
TEST_PPAPI_OUT_OF_PROCESS(Flash_GetCommandLineArgs) |
-// Intermittently fails on OSX. http://crbug.com/111636 |
-#if defined(OS_MACOSX) |
-#define MAYBE_WebSocket_CcInterfaces DISABLED_WebSocket_CcInterfaces |
-#else |
-#define MAYBE_WebSocket_CcInterfaces WebSocket_CcInterfaces |
-#endif |
- |
TEST_PPAPI_IN_PROCESS(WebSocket_IsWebSocket) |
TEST_PPAPI_IN_PROCESS(WebSocket_UninitializedPropertiesAccess) |
TEST_PPAPI_IN_PROCESS(WebSocket_InvalidConnect) |
@@ -899,8 +892,9 @@ TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_ValidClose) |
TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_GetProtocol) |
TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_TextSendReceive) |
TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_BinarySendReceive) |
+TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_StressedSendReceive) |
TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_BufferedAmount) |
-TEST_PPAPI_IN_PROCESS_WITH_WS(MAYBE_WebSocket_CcInterfaces) |
+TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_CcInterfaces) |
TEST_PPAPI_IN_PROCESS(WebSocket_UtilityInvalidConnect) |
TEST_PPAPI_IN_PROCESS(WebSocket_UtilityProtocols) |
TEST_PPAPI_IN_PROCESS(WebSocket_UtilityGetURL) |
@@ -922,8 +916,9 @@ TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_ValidClose) |
TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_GetProtocol) |
TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_TextSendReceive) |
TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_BinarySendReceive) |
+TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_StressedSendReceive) |
TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_BufferedAmount) |
-TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(MAYBE_WebSocket_CcInterfaces) |
+TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_CcInterfaces) |
TEST_PPAPI_NACL_VIA_HTTP(WebSocket_UtilityInvalidConnect) |
TEST_PPAPI_NACL_VIA_HTTP(WebSocket_UtilityProtocols) |
TEST_PPAPI_NACL_VIA_HTTP(WebSocket_UtilityGetURL) |