Refactoring for merging WebSocket test server to 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 47 matching lines @@
 }  // namespace
 
 LocalTestServer::LocalTestServer(Type type,
                                  const std::string& host,
                                  const FilePath& document_root)
     : BaseTestServer(type, host) {
   if (!Init(document_root))
     NOTREACHED();
 }
 
-LocalTestServer::LocalTestServer(const HTTPSOptions& https_options,
+LocalTestServer::LocalTestServer(Type type,
+                                 const SSLOptions& ssl_options,
                                  const FilePath& document_root)
-    : BaseTestServer(https_options) {
+    : BaseTestServer(type, ssl_options) {
   if (!Init(document_root))
     NOTREACHED();
 }
 
 LocalTestServer::~LocalTestServer() {
   Stop();
 }
 
 // static
 bool LocalTestServer::GetTestServerDirectory(FilePath* directory) {
@@ skipping 64 matching lines @@
   // number out over a pipe that this TestServer object will read from. Once
   // that is complete, the host port pair will contain the actual port.
   DCHECK(!GetPort());
   process_handle_ = base::kNullProcessHandle;
 
   FilePath src_dir;
   if (!PathService::Get(base::DIR_SOURCE_ROOT, &src_dir))
     return false;
   SetResourcePath(src_dir.Append(document_root),
                   src_dir.AppendASCII("net")
-                          .AppendASCII("data")
-                          .AppendASCII("ssl")
-                          .AppendASCII("certificates"));
+                         .AppendASCII("data")
+                         .AppendASCII("ssl")
+                         .AppendASCII("certificates"));
   return true;
 }
 
 // static
 bool LocalTestServer::SetPythonPath() {
   FilePath third_party_dir;
   if (!PathService::Get(base::DIR_SOURCE_ROOT, &third_party_dir)) {
     LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
     return false;
   }
@@ skipping 51 matching lines @@
         return false;
     }
   }
 
   // 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.

[Ryan Sleevi, 2012/08/22 09:21:16]

nit: BUG # here?

[Takashi Toyoshima, 2012/08/22 13:39:16]

Done.

+      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