Refactoring for merging WebSocket test server to net::TestServer

chrome/browser/ssl/ssl_browser_tests.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 "base/command_line.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ skipping 60 matching lines @@
   }
 
  private:
   bool waiting_;
   bool seen_;
 };
 
 }  // namespace
 
 class SSLUITest : public InProcessBrowserTest {
-  typedef net::TestServer::HTTPSOptions HTTPSOptions;
+  typedef net::TestServer::SSLOptions SSLOptions;
 
  public:
   SSLUITest()
-      : https_server_(
-            HTTPSOptions(HTTPSOptions::CERT_OK), FilePath(kDocRoot)),
-        https_server_expired_(
-            HTTPSOptions(HTTPSOptions::CERT_EXPIRED), FilePath(kDocRoot)),
-        https_server_mismatched_(
-            HTTPSOptions(HTTPSOptions::CERT_MISMATCHED_NAME),
-            FilePath(kDocRoot)) {}
+      : https_server_(net::TestServer::TYPE_HTTPS,
+                      SSLOptions(SSLOptions::CERT_OK),
+                      FilePath(kDocRoot)),
+        https_server_expired_(net::TestServer::TYPE_HTTPS,
+                              SSLOptions(SSLOptions::CERT_EXPIRED),
+                              FilePath(kDocRoot)),
+        https_server_mismatched_(net::TestServer::TYPE_HTTPS,
+                                 SSLOptions(SSLOptions::CERT_MISMATCHED_NAME),
+                                 FilePath(kDocRoot)) {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) {
     // Browser will both run and display insecure content.
     command_line->AppendSwitch(switches::kAllowRunningInsecureContent);
     // Use process-per-site so that navigating to a same-site page in a
     // new tab will use the same process.
     command_line->AppendSwitch(switches::kProcessPerSite);
   }
 
   void CheckAuthenticatedState(WebContents* tab,
@@ skipping 1394 matching lines @@
 
 // Visit a page over https that contains a frame with a redirect.
 
 // XMLHttpRequest insecure content in synchronous mode.
 
 // XMLHttpRequest insecure content in asynchronous mode.
 
 // XMLHttpRequest over bad ssl in synchronous mode.
 
 // XMLHttpRequest over OK ssl in synchronous mode.