Re-enable PPAPI WebSocket browser tests

chrome/test/ppapi/ppapi_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/ppapi/ppapi_test.h"
 
 #include "base/test/test_timeouts.h"
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 970 matching lines @@
       LIST_TEST(WebSocket_UtilityGetURL) \
       LIST_TEST(WebSocket_UtilityValidConnect) \
       LIST_TEST(WebSocket_UtilityInvalidClose) \
       LIST_TEST(WebSocket_UtilityValidClose) \
       LIST_TEST(WebSocket_UtilityGetProtocol) \
       LIST_TEST(WebSocket_UtilityTextSendReceive) \
       LIST_TEST(WebSocket_UtilityBinarySendReceive) \
       LIST_TEST(WebSocket_UtilityBufferedAmount) \
   )
 
-// Repeatedly flaky on WinXP Tests(1): http://crbug.com/389084
-#if defined(OS_WIN)
-#define MAYBE_WebSocket1 DISABLED_WebSocket1
-#else
-#define MAYBE_WebSocket1 WebSocket1
-#endif
-IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_WebSocket1) {
+IN_PROC_BROWSER_TEST_F(PPAPITest, WebSocket1) {
   RUN_WEBSOCKET_SUBTESTS_1;
 }
-
-// Repeatedly flaky on Win7 Tests(1): http://crbug.com/389084
-#if defined(OS_WIN)
-#define MAYBE_WebSocket2 DISABLED_WebSocket2
-#else
-#define MAYBE_WebSocket2 WebSocket2
-#endif
-IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_WebSocket2) {
+IN_PROC_BROWSER_TEST_F(PPAPITest, WebSocket2) {
   RUN_WEBSOCKET_SUBTESTS_2;
 }
-#if !defined(OS_WIN)  // http://crbug.com/396399
-IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_WebSocket1) {
+IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, WebSocket1) {
   RUN_WEBSOCKET_SUBTESTS_1;
 }
-IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket1) {
-  RUN_WEBSOCKET_SUBTESTS_1;
+IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, WebSocket2) {
+  RUN_WEBSOCKET_SUBTESTS_2;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket1)) {
   RUN_WEBSOCKET_SUBTESTS_1;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(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(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;
-}
-
-// Flaky on XP Tests (3): http://crbug.com/389084
-#if defined(OS_WIN)
-#define MAYBE_WebSocket2 DISABLED_WebSocket2
-#else
-#define MAYBE_WebSocket2 WebSocket2
-#endif
-IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_WebSocket2) {
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, WebSocket2) {
   RUN_WEBSOCKET_SUBTESTS_2;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
                        MAYBE_PNACL_NONSFI(WebSocket1)) {
   RUN_WEBSOCKET_SUBTESTS_1;
 }
 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
                        MAYBE_PNACL_NONSFI(WebSocket2)) {
   RUN_WEBSOCKET_SUBTESTS_2;
 }
@@ skipping 293 matching lines @@
           LIST_TEST(FlashDRM_GetHmonitor)
           LIST_TEST(FlashDRM_GetVoucherFile));
 }
 
 TEST_PPAPI_IN_PROCESS(TalkPrivate)
 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)
 
 #if defined(OS_CHROMEOS)
 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate)
 #endif