reland: Launch pywebsocket via net::TestServer

net/test/local_test_server.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 "net/test/local_test_server.h"
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 158 matching lines @@
   third_party_dir = third_party_dir.AppendASCII("third_party");
 
   // For simplejson. (simplejson, unlike all the other Python modules
   // we include, doesn't have an extra 'simplejson' directory, so we
   // need to include its parent directory, i.e. third_party_dir).
   AppendToPythonPath(third_party_dir);
 
   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/04 09:28:02]

nit: Please apply my suggestion from the previous round of comments.

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

Done.

+                                    .AppendASCII("src"));
 
   // Locate the Python code generated by the protocol buffers compiler.
   FilePath pyproto_dir;
   if (!GetPyProtoPath(&pyproto_dir)) {
     LOG(WARNING) << "Cannot find pyproto dir for generated code. "
                  << "Testserver features that rely on it will not work";
     return true;
   }
 
   AppendToPythonPath(pyproto_dir);
@@ skipping 33 matching lines @@
   }
 
   // Append the appropriate server type argument.
   switch (type()) {
     case TYPE_HTTP:
     case TYPE_HTTPS:
       // The default type is HTTP, no argument required.
       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");
       break;
     case TYPE_SYNC:
       command_line->AppendArg("--sync");
       break;
     case TYPE_TCP_ECHO:
       command_line->AppendArg("--tcp-echo");
       break;
     case TYPE_UDP_ECHO:
       command_line->AppendArg("--udp-echo");
       break;
     case TYPE_GDATA:
       command_line->AppendArg(
           std::string("--auth-token") + "=" + BaseTestServer::kGDataAuthToken);
       break;
     default:
       NOTREACHED();
       return false;
   }
 
   return true;
 }
 
 }  // namespace net