Refactoring for merging WebSocket test server to net::TestServer

chrome/test/pyautolib/pyautolib.i

 // 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.
 //
 // Swig Interface for PyAuto.
 // PyAuto makes the Automation Proxy interface available in Python
 //
 // Running swig as:
 //   swig -python -c++ chrome/test/pyautolib/pyautolib.i
 // would generate pyautolib.py, pyautolib_wrap.cxx
@@ skipping 191 matching lines @@
  public:
   enum Type {
     TYPE_FTP,
     TYPE_HTTP,
     TYPE_HTTPS,
     TYPE_SYNC,
   };
 
   // Initialize a TestServer listening on the specified host (IP or hostname).
   TestServer(Type type, const std::string& host, const FilePath& document_root);
-  // Initialize a HTTPS TestServer with a specific set of HTTPSOptions.
-  TestServer(const HTTPSOptions& https_options,
+  // Initialize a TestServer with a specific set of SSLOptions.
+  TestServer(Type type,
+             const SSLOptions& ssl_options,
              const FilePath& document_root);
 
   %feature("docstring", "Start TestServer over an ephemeral port") Start;
   bool Start();
 
   %feature("docstring", "Stop TestServer") Stop;
   bool Stop();
 
   %feature("docstring", "Get FilePath to the document root") document_root;
   const FilePath& document_root() const;
@@ skipping 15 matching lines @@
   %feature("docstring", "Get xmpp port number in case of sync server.")
       GetSyncXmppPort;
   int GetSyncXmppPort() const {
     int val = 0;
     $self->server_data().GetInteger("xmpp_port", &val);
     return val;
   }
 };
 
 }
-// HTTPSOptions
+// SSLOptions
 %feature("docstring",
-         "HTTPSOptions. Sets one of three types of a cert")
-    HTTPSOptions;
-struct HTTPSOptions {
+         "SSLOptions. Sets one of three types of a cert")
+    SSLOptions;
+struct SSLOptions {
   enum ServerCertificate {
     CERT_OK,
     CERT_MISMATCHED_NAME,
     CERT_EXPIRED,
   };
 
-  // Initialize a new HTTPSOptions that will use the specified certificate.
-  explicit HTTPSOptions(ServerCertificate cert);
+  // Initialize a new SSLOptions that will use the specified certificate.
+  explicit SSLOptions(ServerCertificate cert);
 };
 
 %{
-typedef net::TestServer::HTTPSOptions HTTPSOptions;
+typedef net::TestServer::SSLOptions SSLOptions;
 %}
 
 %pointer_class(int, int_ptr);
 %pointer_class(uint32, uint32_ptr);