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 af94a5027537e5fafda8a24893d354b558559ea4..17137a693cdda8ad4909299661009d7d872a7197 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").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");