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..48ce6601878352c5206eb7386a0d129d41161267 100644
--- a/net/test/local_test_server.cc
+++ b/net/test/local_test_server.cc
@@ -174,8 +174,10 @@ bool LocalTestServer::SetPythonPath() {
   AppendToPythonPath(third_party_dir);
 
   AppendToPythonPath(third_party_dir.AppendASCII("tlslite"));
-  AppendToPythonPath(
-      third_party_dir.AppendASCII("pyftpdlib").AppendASCII("src"));
+  AppendToPythonPath(third_party_dir.AppendASCII("pyftpdlib")
+                                    .AppendASCII("src"));

[Paweł Hajdan Jr., 2012/09/12 10:32:55]

nit: Not really, I prefer the _previous_ wrapping style, i.e. without "hanging
dot". Something more like this:

AppendToPythonPath(
    third_party_dir.AppendASCII("pyftpdlib").AppendASCII("src"));

[Takashi Toyoshima, 2012/09/13 07:06:23]

Ah, I see.
I took wrong way...

+  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");