Refactoring for merging WebSocket test server to 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 e67d4f950df380d833d3503203ed898d24fedfb0..a1a1bc876817d5245b6e5046c2d31baf72fe0a03 100644
--- a/net/test/local_test_server.cc
+++ b/net/test/local_test_server.cc
@@ -65,9 +65,10 @@ LocalTestServer::LocalTestServer(Type type,
     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();
 }
@@ -152,9 +153,9 @@ bool LocalTestServer::Init(const FilePath& document_root) {
     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;
 }
 
@@ -226,6 +227,10 @@ bool LocalTestServer::AddCommandLineArguments(CommandLine* command_line) const {
     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 .

[Paweł Hajdan Jr., 2012/08/30 08:56:34]

NOTIMPLEMENTED() then.

[Takashi Toyoshima, 2012/09/01 09:07:30]

I see.
But this line will be implemented in the subsequent CL you are looking now.
So, I'll replace this with proper implementation. I'll use this macro in the
next chance. Thanks.

+      break;
     case TYPE_FTP:
       command_line->AppendArg("-f");
       break;