Revert of Don't process HSTS/HPKP headers when host is an IP address

net/websockets/websocket_end_to_end_test.cc

 // Copyright 2014 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.
 
 // End-to-end tests for WebSocket.
 //
 // A python server is (re)started for each test, which is moderately
 // inefficient. However, it makes these tests a good fit for scenarios which
 // require special server configurations.
 
@@ skipping 367 matching lines @@
                               GetWebSocketTestDataDirectory());
   ASSERT_TRUE(ws_server.Start());
   InitialiseContext();
 
   GURL ws_url = ws_server.GetURL("truncated-headers");
   EXPECT_FALSE(ConnectAndWait(ws_url));
 }
 
 // Regression test for crbug.com/455215 "HSTS not applied to WebSocket"
 TEST_F(WebSocketEndToEndTest, DISABLED_ON_ANDROID(HstsHttpsToWebSocket)) {
-  SpawnedTestServer::SSLOptions ssl_options(
-      SpawnedTestServer::SSLOptions::CERT_OK_FOR_LOCALHOST);
+  SpawnedTestServer::SSLOptions ssl_options;
   SpawnedTestServer https_server(
       SpawnedTestServer::TYPE_HTTPS, ssl_options,
       base::FilePath(FILE_PATH_LITERAL("net/data/url_request_unittest")));
   SpawnedTestServer wss_server(SpawnedTestServer::TYPE_WSS, ssl_options,
                                GetWebSocketTestDataDirectory());
-
   ASSERT_TRUE(https_server.StartInBackground());
   ASSERT_TRUE(wss_server.StartInBackground());
   ASSERT_TRUE(https_server.BlockUntilStarted());
   ASSERT_TRUE(wss_server.BlockUntilStarted());
   InitialiseContext();
   // Set HSTS via https:
   TestDelegate delegate;
   GURL https_page = https_server.GetURL("files/hsts-headers.html");
   scoped_ptr<URLRequest> request(
       context_.CreateRequest(https_page, DEFAULT_PRIORITY, &delegate));
   request->Start();
   // TestDelegate exits the message loop when the request completes.
   base::RunLoop().Run();
   EXPECT_TRUE(request->status().is_success());
 
   // Check HSTS with ws:
   // Change the scheme from wss: to ws: to verify that it is switched back.
   GURL ws_url = ReplaceUrlScheme(wss_server.GetURL(kEchoServer), "ws");
   EXPECT_TRUE(ConnectAndWait(ws_url));
 }
 
 TEST_F(WebSocketEndToEndTest, DISABLED_ON_ANDROID(HstsWebSocketToHttps)) {
-  SpawnedTestServer::SSLOptions ssl_options(
-      SpawnedTestServer::SSLOptions::CERT_OK_FOR_LOCALHOST);
+  SpawnedTestServer::SSLOptions ssl_options;
   SpawnedTestServer https_server(
       SpawnedTestServer::TYPE_HTTPS, ssl_options,
       base::FilePath(FILE_PATH_LITERAL("net/data/url_request_unittest")));
   SpawnedTestServer wss_server(SpawnedTestServer::TYPE_WSS, ssl_options,
                                GetWebSocketTestDataDirectory());
   ASSERT_TRUE(https_server.StartInBackground());
   ASSERT_TRUE(wss_server.StartInBackground());
   ASSERT_TRUE(https_server.BlockUntilStarted());
   ASSERT_TRUE(wss_server.BlockUntilStarted());
   InitialiseContext();
   // Set HSTS via wss:
   GURL wss_url = wss_server.GetURL("set-hsts");
   EXPECT_TRUE(ConnectAndWait(wss_url));
 
   // Verify via http:
   TestDelegate delegate;
   GURL http_page =
       ReplaceUrlScheme(https_server.GetURL("files/simple.html"), "http");
   scoped_ptr<URLRequest> request(
       context_.CreateRequest(http_page, DEFAULT_PRIORITY, &delegate));
   request->Start();
   // TestDelegate exits the message loop when the request completes.
   base::RunLoop().Run();
   EXPECT_TRUE(request->status().is_success());
   EXPECT_TRUE(request->url().SchemeIs("https"));
 }
 
 TEST_F(WebSocketEndToEndTest, DISABLED_ON_ANDROID(HstsWebSocketToWebSocket)) {
-  SpawnedTestServer::SSLOptions ssl_options(
-      SpawnedTestServer::SSLOptions::CERT_OK_FOR_LOCALHOST);
+  SpawnedTestServer::SSLOptions ssl_options;
   SpawnedTestServer wss_server(SpawnedTestServer::TYPE_WSS, ssl_options,
                                GetWebSocketTestDataDirectory());
   ASSERT_TRUE(wss_server.Start());
   InitialiseContext();
   // Set HSTS via wss:
   GURL wss_url = wss_server.GetURL("set-hsts");
   EXPECT_TRUE(ConnectAndWait(wss_url));
 
   // Verify via wss:
   GURL ws_url = ReplaceUrlScheme(wss_server.GetURL(kEchoServer), "ws");
@@ skipping 28 matching lines @@
   GURL ws_url = ws_server.GetURL("header-continuation");
 
   EXPECT_TRUE(ConnectAndWait(ws_url));
   EXPECT_EQ("permessage-deflate; server_max_window_bits=10",
             event_interface_->extensions());
 }
 
 }  // namespace
 
 }  // namespace net