WebSocket Pepper API: SRPC proxy implementation

chrome/test/ui/ppapi_uitest.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 "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/test/test_timeouts.h"
 #include "build/build_config.h"
 #include "content/public/common/content_switches.h"
@@ skipping 106 matching lines @@
     net::TestServer test_server(net::TestServer::TYPE_HTTP, web_dir);
     ASSERT_TRUE(test_server.Start());
     std::string query = BuildQuery("files/test_case.html?", test_case);
 
     scoped_refptr<TabProxy> tab = GetActiveTab();
     GURL url = test_server.GetURL(query);
     EXPECT_TRUE(tab->NavigateToURLBlockUntilNavigationsComplete(url, 1));
     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));
     // TODO(toyoshim): Remove following logging after a bug investigation.
     // http://crbug.com/107836 .
     LOG(INFO) << "Assume LayoutTests in " << websocket_root_dir.MaybeAsASCII();
 
     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) {
     const char* const prefixes[] = { "FAILS_", "FLAKY_", "DISABLED_" };
     for (size_t i = 0; i < sizeof(prefixes)/sizeof(prefixes[0]); ++i)
       if (test_name.find(prefixes[i]) == 0)
         return test_name.substr(strlen(prefixes[i]));
     return test_name;
   }
 
@@ skipping 138 matching lines @@
       RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
     }
 #define TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(test_name) \
     TEST_F(OutOfProcessPPAPITest, test_name) { \
       RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
     }
 
 // 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
 
 
 //
 // Interface tests.
 //
 
 // Disable tests under ASAN.  http://crbug.com/104832.
 // This is a bit heavy handed, but the majority of these tests fail under ASAN.
 // See bug for history.
@@ skipping 345 matching lines @@
 TEST_PPAPI_IN_PROCESS(WebSocket_Protocols)
 TEST_PPAPI_IN_PROCESS(WebSocket_GetURL)
 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_ValidConnect)
 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_InvalidClose)
 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_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)
 TEST_PPAPI_OUT_OF_PROCESS(AudioConfig_ValidConfigs)
 TEST_PPAPI_OUT_OF_PROCESS(AudioConfig_InvalidConfigs)
 
 TEST_PPAPI_IN_PROCESS(Audio_Creation)
 TEST_PPAPI_IN_PROCESS(Audio_DestroyNoStop)
 TEST_PPAPI_IN_PROCESS(Audio_Failures)
 TEST_PPAPI_OUT_OF_PROCESS(Audio_Creation)
@@ skipping 60 matching lines @@
 TEST_PPAPI_IN_PROCESS(ResourceArray_Basics)
 TEST_PPAPI_IN_PROCESS(ResourceArray_OutOfRangeAccess)
 TEST_PPAPI_IN_PROCESS(ResourceArray_EmptyArray)
 TEST_PPAPI_IN_PROCESS(ResourceArray_InvalidElement)
 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_Basics)
 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_OutOfRangeAccess)
 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_EmptyArray)
 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_InvalidElement)
 
 #endif // ADDRESS_SANITIZER