reland: Launch pywebsocket via net::TestServer

net/test/local_test_server.cc

Index: net/test/local_test_server.cc
diff --git a/net/test/local_test_server.cc b/net/test/local_test_server.cc
index a1a1bc876817d5245b6e5046c2d31baf72fe0a03..72147ad0ad3944492df37162099b9f50328e02fd 100644
--- a/net/test/local_test_server.cc
+++ b/net/test/local_test_server.cc
@@ -176,6 +176,8 @@ bool LocalTestServer::SetPythonPath() {
   AppendToPythonPath(third_party_dir.AppendASCII("tlslite"));
   AppendToPythonPath(
       third_party_dir.AppendASCII("pyftpdlib").AppendASCII("src"));
+  AppendToPythonPath(third_party_dir.AppendASCII("pywebsocket")

[Paweł Hajdan Jr., 2012/09/01 07:39:10]

nit: Please follow line wrapping convention from above two lines if possible.

[Takashi Toyoshima, 2012/09/11 06:36:32]

Done.

+                                    .AppendASCII("src"));
 
   // Locate the Python code generated by the protocol buffers compiler.
   FilePath pyproto_dir;
@@ -229,7 +231,7 @@ bool LocalTestServer::AddCommandLineArguments(CommandLine* command_line) const {
       break;
     case TYPE_WS:
     case TYPE_WSS:
-      // TODO(toyoshim): Handle correctly. See, http://crbug.com/137639 .
+      command_line->AppendArg("--websocket");
       break;
     case TYPE_FTP:
       command_line->AppendArg("-f");