WebSocket Pepper API: in process API implementation (reland)

chrome/test/ui/ppapi_uitest.cc

Index: chrome/test/ui/ppapi_uitest.cc
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc
index 5b2a83116e17c9ae72a086a2fe05a9bc61e5e781..68f42e2620a1b71ce33bdd307dad0955e64dc3e4 100644
--- a/chrome/test/ui/ppapi_uitest.cc
+++ b/chrome/test/ui/ppapi_uitest.cc
@@ -231,6 +231,17 @@ class PPAPINaClTest : public PPAPITestBase {
       RunTestViaHTTP(#test_name); \
     }
 
+// Similar macros that test with WebSocket server
+#define TEST_PPAPI_IN_PROCESS_WITH_WS(test_name) \
+    TEST_F(PPAPITest, test_name) { \
+      RunTestWithWebSocketServer(#test_name); \
+    }
+#define TEST_PPAPI_OUT_OF_PROCESS_WITH_WS(test_name) \
+    TEST_F(OutOfProcessPPAPITest, test_name) { \
+      RunTestWithWebSocketServer(#test_name); \
+    }
+
+
 
 // NaCl based PPAPI tests
 #define TEST_PPAPI_NACL_VIA_HTTP(test_name) \
@@ -460,7 +471,9 @@ TEST_PPAPI_OUT_OF_PROCESS(Flash_MessageLoop)
 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset)
 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetCommandLineArgs)
 
-TEST_PPAPI_IN_PROCESS(WebSocket_Create)
+TEST_PPAPI_IN_PROCESS(WebSocket_InvalidConnect)
 TEST_PPAPI_IN_PROCESS(WebSocket_IsWebSocket)
+TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_ValidConnect)
+TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_TextSendReceive)
 
 #endif // ADDRESS_SANITIZER