Refactoring for merging WebSocket test server to net::TestServer

net/tools/testserver/run_testserver.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 <stdio.h>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
@@ skipping 94 matching lines @@
   if (command_line->HasSwitch("https")) {
     server_type = net::TestServer::TYPE_HTTPS;
   } else if (command_line->HasSwitch("ftp")) {
     server_type = net::TestServer::TYPE_FTP;
   } else if (command_line->HasSwitch("sync")) {
     server_type = net::TestServer::TYPE_SYNC;
   } else if (command_line->HasSwitch("sync-test")) {
     return RunSyncTest() ? 0 : -1;
   }
 
-  net::TestServer::HTTPSOptions https_options;
+  net::TestServer::SSLOptions ssl_options;
   if (command_line->HasSwitch("https-cert")) {
     server_type = net::TestServer::TYPE_HTTPS;
     std::string cert_option = command_line->GetSwitchValueASCII("https-cert");
     if (cert_option == "ok") {
-      https_options.server_certificate = net::TestServer::HTTPSOptions::CERT_OK;
+      ssl_options.server_certificate = net::TestServer::SSLOptions::CERT_OK;
     } else if (cert_option == "mismatched-name") {
-      https_options.server_certificate =
-          net::TestServer::HTTPSOptions::CERT_MISMATCHED_NAME;
+      ssl_options.server_certificate =
+          net::TestServer::SSLOptions::CERT_MISMATCHED_NAME;
     } else if (cert_option == "expired") {
-      https_options.server_certificate =
-          net::TestServer::HTTPSOptions::CERT_EXPIRED;
+      ssl_options.server_certificate =
+          net::TestServer::SSLOptions::CERT_EXPIRED;
     } else {
       printf("Error: --https-cert has invalid value %s\n", cert_option.c_str());
       PrintUsage();
       return -1;
     }
   }
 
   FilePath doc_root = command_line->GetSwitchValuePath("doc-root");
   if ((server_type != net::TestServer::TYPE_SYNC) && doc_root.empty()) {
     printf("Error: --doc-root must be specified\n");
     PrintUsage();
     return -1;
   }
 
   scoped_ptr<net::TestServer> test_server;
   switch (server_type) {
     case net::TestServer::TYPE_HTTPS: {
-      test_server.reset(new net::TestServer(https_options, doc_root));
+      test_server.reset(new net::TestServer(server_type,
+                                            ssl_options,
+                                            doc_root));

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

nit: Is this line breaking needed? Looks like it fits on one line?

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

Yeah, unfortunately it requires 81 characters without line break :(

       break;
     }
     case net::TestServer::TYPE_SYNC: {
       uint16 port = 0;
       uint16 xmpp_port = 0;
       if (!GetPortFromSwitch("port", &port) ||
           !GetPortFromSwitch("xmpp-port", &xmpp_port)) {
         printf("Error: Could not extract --port and/or --xmpp-port.\n");
         return -1;
       }
@@ skipping 18 matching lines @@
         UTF16ToUTF8(test_server->document_root().LossyDisplayName()).c_str());
     return -1;
   }
 
   printf("testserver running at %s (type ctrl+c to exit)\n",
          test_server->host_port_pair().ToString().c_str());
 
   message_loop.Run();
   return 0;
 }