WebSocket Pepper API: SRPC proxy implementation

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 931dc63b5c241a4ddad933533ee45b5b53955243..403fc49ee40d5ec7b166f4ae957fe3dd968ba3a2 100644
--- a/chrome/test/ui/ppapi_uitest.cc
+++ b/chrome/test/ui/ppapi_uitest.cc
@@ -124,7 +124,8 @@ class PPAPITestBase : public UITest {
     RunTestURL(tab, url);
   }
 
-  void RunTestWithWebSocketServer(const std::string& test_case) {
+  void RunTestWithWebSocketServer(const std::string& test_case,
+                                  bool via_http) {
     FilePath websocket_root_dir;
     ASSERT_TRUE(
         PathService::Get(chrome::DIR_LAYOUT_TESTS, &websocket_root_dir));
@@ -134,7 +135,10 @@ class PPAPITestBase : public UITest {
 
     ui_test_utils::TestWebSocketServer server;
     ASSERT_TRUE(server.Start(websocket_root_dir));
-    RunTest(test_case);
+    if (via_http)
+      RunTestViaHTTP(test_case);

[dmichael (off chromium), 2012/01/17 23:32:45]

I'm fine with this way, but couldn't you also just always run it via HTTP?

[Takashi Toyoshima, 2012/01/18 11:07:16]

Yes, I can. Is it make things simple?
Done.

+    else
+      RunTest(test_case);
   }
 
   std::string StripPrefixes(const std::string& test_name) {
@@ -293,30 +297,37 @@ class PPAPINaClTestDisallowedSockets : public PPAPITestBase {
 // Similar macros that test with WebSocket server
 #define TEST_PPAPI_IN_PROCESS_WITH_WS(test_name) \
     TEST_F(PPAPITest, test_name) { \
-      RunTestWithWebSocketServer(STRIP_PREFIXES(test_name)); \
+      RunTestWithWebSocketServer(STRIP_PREFIXES(test_name), false); \
     }
 #define TEST_PPAPI_OUT_OF_PROCESS_WITH_WS(test_name) \
     TEST_F(OutOfProcessPPAPITest, test_name) { \
-      RunTestWithWebSocketServer(STRIP_PREFIXES(test_name)); \
+      RunTestWithWebSocketServer(STRIP_PREFIXES(test_name), false); \
     }
 
 
 #if defined(DISABLE_NACL)
 #define TEST_PPAPI_NACL_VIA_HTTP(test_name)
 #define TEST_PPAPI_NACL_VIA_HTTP_DISALLOWED_SOCKETS(test_name)
+#define TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(test_name)
 #else
 
 // NaCl based PPAPI tests
 #define TEST_PPAPI_NACL_VIA_HTTP(test_name) \
     TEST_F(PPAPINaClTest, test_name) { \
-  RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
-}
+      RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
+    }
 
 // NaCl based PPAPI tests with disallowed socket API
 #define TEST_PPAPI_NACL_VIA_HTTP_DISALLOWED_SOCKETS(test_name) \
     TEST_F(PPAPINaClTestDisallowedSockets, test_name) { \
-  RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
-}
+      RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
+    }
+
+// NaCl based PPAPI tests with WebSocket server
+#define TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(test_name) \
+    TEST_F(PPAPINaClTest, test_name) { \
+      RunTestWithWebSocketServer(STRIP_PREFIXES(test_name), true); \
+    }
 #endif
 
 
@@ -682,6 +693,19 @@ TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_TextSendReceive)
 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_BinarySendReceive)
 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_BufferedAmount)
 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_CcInterfaces)
+TEST_PPAPI_NACL_VIA_HTTP(WebSocket_IsWebSocket)
+TEST_PPAPI_NACL_VIA_HTTP(WebSocket_UninitializedPropertiesAccess)
+TEST_PPAPI_NACL_VIA_HTTP(WebSocket_InvalidConnect)
+TEST_PPAPI_NACL_VIA_HTTP(WebSocket_Protocols)
+TEST_PPAPI_NACL_VIA_HTTP(WebSocket_GetURL)
+TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_ValidConnect)
+TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_InvalidClose)
+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_BufferedAmount)
+TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_CcInterfaces)
 
 TEST_PPAPI_IN_PROCESS(AudioConfig_ValidConfigs)
 TEST_PPAPI_IN_PROCESS(AudioConfig_InvalidConfigs)