Update from https://crrev.com/312600

net/websockets/websocket_stream_test.cc

 // Copyright 2013 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 "net/websockets/websocket_stream.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 92 matching lines @@
     stream->SetWebSocketKeyForTesting("dGhlIHNhbXBsZSBub25jZQ==");
   }
 };
 
 class WebSocketStreamCreateTest : public ::testing::Test {
  public:
   WebSocketStreamCreateTest() : has_failed_(false), ssl_fatal_(false) {}
 
   void CreateAndConnectCustomResponse(
       const std::string& socket_url,
+      const std::string& socket_host,
       const std::string& socket_path,
       const std::vector<std::string>& sub_protocols,
       const std::string& origin,
       const std::string& extra_request_headers,
       const std::string& response_body,
       scoped_ptr<base::Timer> timer = scoped_ptr<base::Timer>()) {
     url_request_context_host_.SetExpectations(
-        WebSocketStandardRequest(socket_path, origin, extra_request_headers),
+        WebSocketStandardRequest(socket_path, socket_host, origin,
+                                 extra_request_headers),
         response_body);
     CreateAndConnectStream(socket_url, sub_protocols, origin, timer.Pass());
   }
 
   // |extra_request_headers| and |extra_response_headers| must end in "\r\n" or
   // errors like "Unable to perform synchronous IO while stopped" will occur.
-  void CreateAndConnectStandard(const std::string& socket_url,
-                                const std::string& socket_path,
-                                const std::vector<std::string>& sub_protocols,
-                                const std::string& origin,
-                                const std::string& extra_request_headers,
-                                const std::string& extra_response_headers,
-                                scoped_ptr<base::Timer> timer =
-                                scoped_ptr<base::Timer>()) {
+  void CreateAndConnectStandard(
+      const std::string& socket_url,
+      const std::string& socket_host,
+      const std::string& socket_path,
+      const std::vector<std::string>& sub_protocols,
+      const std::string& origin,
+      const std::string& extra_request_headers,
+      const std::string& extra_response_headers,
+      scoped_ptr<base::Timer> timer = scoped_ptr<base::Timer>()) {
     CreateAndConnectCustomResponse(
-        socket_url,
-        socket_path,
-        sub_protocols,
-        origin,
+        socket_url, socket_host, socket_path, sub_protocols, origin,
         extra_request_headers,
-        WebSocketStandardResponse(extra_response_headers),
-        timer.Pass());
+        WebSocketStandardResponse(extra_response_headers), timer.Pass());
   }
 
   void CreateAndConnectRawExpectations(
       const std::string& socket_url,
       const std::vector<std::string>& sub_protocols,
       const std::string& origin,
       scoped_ptr<DeterministicSocketData> socket_data,
       scoped_ptr<base::Timer> timer = scoped_ptr<base::Timer>()) {
     AddRawExpectations(socket_data.Pass());
     CreateAndConnectStream(socket_url, sub_protocols, origin, timer.Pass());
@@ skipping 101 matching lines @@
 // There are enough tests of the Sec-WebSocket-Extensions header that they
 // deserve their own test fixture.
 class WebSocketStreamCreateExtensionTest : public WebSocketStreamCreateTest {
  public:
   // Performs a standard connect, with the value of the Sec-WebSocket-Extensions
   // header in the response set to |extensions_header_value|. Runs the event
   // loop to allow the connect to complete.
   void CreateAndConnectWithExtensions(
       const std::string& extensions_header_value) {
     CreateAndConnectStandard(
-        "ws://localhost/testing_path",
-        "/testing_path",
-        NoSubProtocols(),
-        "http://localhost",
-        "",
+        "ws://localhost/testing_path", "localhost", "/testing_path",
+        NoSubProtocols(), "http://localhost", "",
         "Sec-WebSocket-Extensions: " + extensions_header_value + "\r\n");
     RunUntilIdle();
   }
 };
 
 // Common code to construct expectations for authentication tests that receive
 // the auth challenge on one connection and then create a second connection to
 // send the authenticated request on.
 class CommonAuthTestHelper {
  public:
   CommonAuthTestHelper() : reads1_(), writes1_(), reads2_(), writes2_() {}
 
   scoped_ptr<DeterministicSocketData> BuildSocketData1(
       const std::string& response) {
-    request1_ = WebSocketStandardRequest("/", "http://localhost", "");
+    request1_ =
+        WebSocketStandardRequest("/", "localhost", "http://localhost", "");
     writes1_[0] = MockWrite(SYNCHRONOUS, 0, request1_.c_str());
     response1_ = response;
     reads1_[0] = MockRead(SYNCHRONOUS, 1, response1_.c_str());
     reads1_[1] = MockRead(SYNCHRONOUS, OK, 2);  // Close connection
 
     return BuildSocketData(reads1_, writes1_);
   }
 
   scoped_ptr<DeterministicSocketData> BuildSocketData2(
       const std::string& request,
@@ skipping 120 matching lines @@
   scoped_ptr<base::HistogramSamples> GetSamples(const std::string& name) {
     base::HistogramBase* histogram =
         base::StatisticsRecorder::FindHistogram(name);
     return histogram ? histogram->SnapshotSamples()
                      : scoped_ptr<base::HistogramSamples>();
   }
 };
 
 // Confirm that the basic case works as expected.
 TEST_F(WebSocketStreamCreateTest, SimpleSuccess) {
-  CreateAndConnectStandard(
-      "ws://localhost/", "/", NoSubProtocols(), "http://localhost", "", "");
+  CreateAndConnectStandard("ws://localhost/", "localhost", "/",
+                           NoSubProtocols(), "http://localhost", "", "");
   EXPECT_FALSE(request_info_);
   EXPECT_FALSE(response_info_);
   RunUntilIdle();
   EXPECT_FALSE(has_failed());
   EXPECT_TRUE(stream_);
   EXPECT_TRUE(request_info_);
   EXPECT_TRUE(response_info_);
 }
 
 TEST_F(WebSocketStreamCreateTest, HandshakeInfo) {
   static const char kResponse[] =
       "HTTP/1.1 101 Switching Protocols\r\n"
       "Upgrade: websocket\r\n"
       "Connection: Upgrade\r\n"
       "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n"
       "foo: bar, baz\r\n"
       "hoge: fuga\r\n"
       "hoge: piyo\r\n"
       "\r\n";
 
-  CreateAndConnectCustomResponse(
-      "ws://localhost/",
-      "/",
-      NoSubProtocols(),
-      "http://localhost",
-      "",
-      kResponse);
+  CreateAndConnectCustomResponse("ws://localhost/", "localhost", "/",
+                                 NoSubProtocols(), "http://localhost", "",
+                                 kResponse);
   EXPECT_FALSE(request_info_);
   EXPECT_FALSE(response_info_);
   RunUntilIdle();
   EXPECT_TRUE(stream_);
   ASSERT_TRUE(request_info_);
   ASSERT_TRUE(response_info_);
   std::vector<HeaderKeyValuePair> request_headers =
       ToVector(request_info_->headers);
   // We examine the contents of request_info_ and response_info_
   // mainly only in this test case.
@@ skipping 31 matching lines @@
   EXPECT_EQ(HeaderKeyValuePair("Connection", "Upgrade"), response_headers[0]);
   EXPECT_EQ("Sec-WebSocket-Accept", response_headers[1].first);
   EXPECT_EQ(HeaderKeyValuePair("Upgrade", "websocket"), response_headers[2]);
   EXPECT_EQ(HeaderKeyValuePair("foo", "bar, baz"), response_headers[3]);
   EXPECT_EQ(HeaderKeyValuePair("hoge", "fuga"), response_headers[4]);
   EXPECT_EQ(HeaderKeyValuePair("hoge", "piyo"), response_headers[5]);
 }
 
 // Confirm that the stream isn't established until the message loop runs.
 TEST_F(WebSocketStreamCreateTest, NeedsToRunLoop) {
-  CreateAndConnectStandard(
-      "ws://localhost/", "/", NoSubProtocols(), "http://localhost", "", "");
+  CreateAndConnectStandard("ws://localhost/", "localhost", "/",
+                           NoSubProtocols(), "http://localhost", "", "");
   EXPECT_FALSE(has_failed());
   EXPECT_FALSE(stream_);
 }
 
 // Check the path is used.
 TEST_F(WebSocketStreamCreateTest, PathIsUsed) {
-  CreateAndConnectStandard("ws://localhost/testing_path",
-                           "/testing_path",
-                           NoSubProtocols(),
-                           "http://localhost",
-                           "",
-                           "");
+  CreateAndConnectStandard("ws://localhost/testing_path", "localhost",
+                           "/testing_path", NoSubProtocols(),
+                           "http://localhost", "", "");
   RunUntilIdle();
   EXPECT_FALSE(has_failed());
   EXPECT_TRUE(stream_);
 }
 
 // Check that the origin is used.
 TEST_F(WebSocketStreamCreateTest, OriginIsUsed) {
-  CreateAndConnectStandard("ws://localhost/testing_path",
-                           "/testing_path",
-                           NoSubProtocols(),
-                           "http://google.com",
-                           "",
-                           "");
+  CreateAndConnectStandard("ws://localhost/testing_path", "localhost",
+                           "/testing_path", NoSubProtocols(),
+                           "http://google.com", "", "");
   RunUntilIdle();
   EXPECT_FALSE(has_failed());
   EXPECT_TRUE(stream_);
 }
 
 // Check that sub-protocols are sent and parsed.
 TEST_F(WebSocketStreamCreateTest, SubProtocolIsUsed) {
   std::vector<std::string> sub_protocols;
   sub_protocols.push_back("chatv11.chromium.org");
   sub_protocols.push_back("chatv20.chromium.org");
-  CreateAndConnectStandard("ws://localhost/testing_path",
-                           "/testing_path",
-                           sub_protocols,
-                           "http://google.com",
+  CreateAndConnectStandard("ws://localhost/testing_path", "localhost",
+                           "/testing_path", sub_protocols, "http://google.com",
                            "Sec-WebSocket-Protocol: chatv11.chromium.org, "
                            "chatv20.chromium.org\r\n",
                            "Sec-WebSocket-Protocol: chatv20.chromium.org\r\n");
   RunUntilIdle();
   EXPECT_TRUE(stream_);
   EXPECT_FALSE(has_failed());
   EXPECT_EQ("chatv20.chromium.org", stream_->GetSubProtocol());
 }
 
 // Unsolicited sub-protocols are rejected.
 TEST_F(WebSocketStreamCreateTest, UnsolicitedSubProtocol) {
-  CreateAndConnectStandard("ws://localhost/testing_path",
-                           "/testing_path",
-                           NoSubProtocols(),
-                           "http://google.com",
-                           "",
+  CreateAndConnectStandard("ws://localhost/testing_path", "localhost",
+                           "/testing_path", NoSubProtocols(),
+                           "http://google.com", "",
                            "Sec-WebSocket-Protocol: chatv20.chromium.org\r\n");
   RunUntilIdle();
   EXPECT_FALSE(stream_);
   EXPECT_TRUE(has_failed());
   EXPECT_EQ("Error during WebSocket handshake: "
             "Response must not include 'Sec-WebSocket-Protocol' header "
             "if not present in request: chatv20.chromium.org",
             failure_message());
 }
 
 // Missing sub-protocol response is rejected.
 TEST_F(WebSocketStreamCreateTest, UnacceptedSubProtocol) {
   std::vector<std::string> sub_protocols;
   sub_protocols.push_back("chat.example.com");
-  CreateAndConnectStandard("ws://localhost/testing_path",
-                           "/testing_path",
-                           sub_protocols,
-                           "http://localhost",
-                           "Sec-WebSocket-Protocol: chat.example.com\r\n",
-                           "");
+  CreateAndConnectStandard("ws://localhost/testing_path", "localhost",
+                           "/testing_path", sub_protocols, "http://localhost",
+                           "Sec-WebSocket-Protocol: chat.example.com\r\n", "");
   RunUntilIdle();
   EXPECT_FALSE(stream_);
   EXPECT_TRUE(has_failed());
   EXPECT_EQ("Error during WebSocket handshake: "
             "Sent non-empty 'Sec-WebSocket-Protocol' header "
             "but no response was received",
             failure_message());
 }
 
 // Only one sub-protocol can be accepted.
 TEST_F(WebSocketStreamCreateTest, MultipleSubProtocolsInResponse) {
   std::vector<std::string> sub_protocols;
   sub_protocols.push_back("chatv11.chromium.org");
   sub_protocols.push_back("chatv20.chromium.org");
-  CreateAndConnectStandard("ws://localhost/testing_path",
-                           "/testing_path",
-                           sub_protocols,
-                           "http://google.com",
+  CreateAndConnectStandard("ws://localhost/testing_path", "localhost",
+                           "/testing_path", sub_protocols, "http://google.com",
                            "Sec-WebSocket-Protocol: chatv11.chromium.org, "
                            "chatv20.chromium.org\r\n",
                            "Sec-WebSocket-Protocol: chatv11.chromium.org, "
                            "chatv20.chromium.org\r\n");
   RunUntilIdle();
   EXPECT_FALSE(stream_);
   EXPECT_TRUE(has_failed());
   EXPECT_EQ("Error during WebSocket handshake: "
             "'Sec-WebSocket-Protocol' header must not appear "
             "more than once in a response",
             failure_message());
 }
 
 // Unmatched sub-protocol should be rejected.
 TEST_F(WebSocketStreamCreateTest, UnmatchedSubProtocolInResponse) {
   std::vector<std::string> sub_protocols;
   sub_protocols.push_back("chatv11.chromium.org");
   sub_protocols.push_back("chatv20.chromium.org");
-  CreateAndConnectStandard("ws://localhost/testing_path",
-                           "/testing_path",
-                           sub_protocols,
-                           "http://google.com",
+  CreateAndConnectStandard("ws://localhost/testing_path", "localhost",
+                           "/testing_path", sub_protocols, "http://google.com",
                            "Sec-WebSocket-Protocol: chatv11.chromium.org, "
                            "chatv20.chromium.org\r\n",
                            "Sec-WebSocket-Protocol: chatv21.chromium.org\r\n");
   RunUntilIdle();
   EXPECT_FALSE(stream_);
   EXPECT_TRUE(has_failed());
   EXPECT_EQ("Error during WebSocket handshake: "
             "'Sec-WebSocket-Protocol' header value 'chatv21.chromium.org' "
             "in response does not match any of sent values",
             failure_message());
@@ skipping 13 matching lines @@
       "server_max_window_bits=11; client_max_window_bits=13; "
       "server_no_context_takeover");
   EXPECT_TRUE(stream_);
   EXPECT_FALSE(has_failed());
 }
 
 // Verify that incoming messages are actually decompressed with
 // permessage-deflate enabled.
 TEST_F(WebSocketStreamCreateExtensionTest, PerMessageDeflateInflates) {
   CreateAndConnectCustomResponse(
-      "ws://localhost/testing_path",
-      "/testing_path",
-      NoSubProtocols(),
-      "http://localhost",
-      "",
+      "ws://localhost/testing_path", "localhost", "/testing_path",
+      NoSubProtocols(), "http://localhost", "",
       WebSocketStandardResponse(
           "Sec-WebSocket-Extensions: permessage-deflate\r\n") +
           std::string(
               "\xc1\x07"  // WebSocket header (FIN + RSV1, Text payload 7 bytes)
               "\xf2\x48\xcd\xc9\xc9\x07\x00",  // "Hello" DEFLATE compressed
               9));
   RunUntilIdle();
 
   ASSERT_TRUE(stream_);
   ScopedVector<WebSocketFrame> frames;
@@ skipping 161 matching lines @@
       failure_message());
 }
 
 // TODO(ricea): Check that WebSocketDeflateStream is initialised with the
 // arguments from the server. This is difficult because the data written to the
 // socket is randomly masked.
 
 // Additional Sec-WebSocket-Accept headers should be rejected.
 TEST_F(WebSocketStreamCreateTest, DoubleAccept) {
   CreateAndConnectStandard(
-      "ws://localhost/",
-      "/",
-      NoSubProtocols(),
-      "http://localhost",
-      "",
-      "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n");
+      "ws://localhost/", "localhost", "/", NoSubProtocols(), "http://localhost",
+      "", "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n");
   RunUntilIdle();
   EXPECT_FALSE(stream_);
   EXPECT_TRUE(has_failed());
   EXPECT_EQ("Error during WebSocket handshake: "
             "'Sec-WebSocket-Accept' header must not appear "
             "more than once in a response",
             failure_message());
 }
 
 // Response code 200 must be rejected.
 TEST_F(WebSocketStreamCreateTest, InvalidStatusCode) {
   static const char kInvalidStatusCodeResponse[] =
       "HTTP/1.1 200 OK\r\n"
       "Upgrade: websocket\r\n"
       "Connection: Upgrade\r\n"
       "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n"
       "\r\n";
-  CreateAndConnectCustomResponse("ws://localhost/",
-                                 "/",
-                                 NoSubProtocols(),
-                                 "http://localhost",
-                                 "",
+  CreateAndConnectCustomResponse("ws://localhost/", "localhost", "/",
+                                 NoSubProtocols(), "http://localhost", "",
                                  kInvalidStatusCodeResponse);
   RunUntilIdle();
   EXPECT_TRUE(has_failed());
   EXPECT_EQ("Error during WebSocket handshake: Unexpected response code: 200",
             failure_message());
 }
 
 // Redirects are not followed (according to the WHATWG WebSocket API, which
 // overrides RFC6455 for browser applications).
 TEST_F(WebSocketStreamCreateTest, RedirectsRejected) {
   static const char kRedirectResponse[] =
       "HTTP/1.1 302 Moved Temporarily\r\n"
       "Content-Type: text/html\r\n"
       "Content-Length: 34\r\n"
       "Connection: keep-alive\r\n"
       "Location: ws://localhost/other\r\n"
       "\r\n"
       "<title>Moved</title><h1>Moved</h1>";
-  CreateAndConnectCustomResponse("ws://localhost/",
-                                 "/",
-                                 NoSubProtocols(),
-                                 "http://localhost",
-                                 "",
+  CreateAndConnectCustomResponse("ws://localhost/", "localhost", "/",
+                                 NoSubProtocols(), "http://localhost", "",
                                  kRedirectResponse);
   RunUntilIdle();
   EXPECT_TRUE(has_failed());
   EXPECT_EQ("Error during WebSocket handshake: Unexpected response code: 302",
             failure_message());
 }
 
 // Malformed responses should be rejected. HttpStreamParser will accept just
 // about any garbage in the middle of the headers. To make it give up, the junk
 // has to be at the start of the response. Even then, it just gets treated as an
 // HTTP/0.9 response.
 TEST_F(WebSocketStreamCreateTest, MalformedResponse) {
   static const char kMalformedResponse[] =
       "220 mx.google.com ESMTP\r\n"
       "HTTP/1.1 101 OK\r\n"
       "Upgrade: websocket\r\n"
       "Connection: Upgrade\r\n"
       "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n"
       "\r\n";
-  CreateAndConnectCustomResponse("ws://localhost/",
-                                 "/",
-                                 NoSubProtocols(),
-                                 "http://localhost",
-                                 "",
+  CreateAndConnectCustomResponse("ws://localhost/", "localhost", "/",
+                                 NoSubProtocols(), "http://localhost", "",
                                  kMalformedResponse);
   RunUntilIdle();
   EXPECT_TRUE(has_failed());
   EXPECT_EQ("Error during WebSocket handshake: Invalid status line",
             failure_message());
 }
 
 // Upgrade header must be present.
 TEST_F(WebSocketStreamCreateTest, MissingUpgradeHeader) {
   static const char kMissingUpgradeResponse[] =
       "HTTP/1.1 101 Switching Protocols\r\n"
       "Connection: Upgrade\r\n"
       "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n"
       "\r\n";
-  CreateAndConnectCustomResponse("ws://localhost/",
-                                 "/",
-                                 NoSubProtocols(),
-                                 "http://localhost",
-                                 "",
+  CreateAndConnectCustomResponse("ws://localhost/", "localhost", "/",
+                                 NoSubProtocols(), "http://localhost", "",
                                  kMissingUpgradeResponse);
   RunUntilIdle();
   EXPECT_TRUE(has_failed());
   EXPECT_EQ("Error during WebSocket handshake: 'Upgrade' header is missing",
             failure_message());
 }
 
 // There must only be one upgrade header.
 TEST_F(WebSocketStreamCreateTest, DoubleUpgradeHeader) {
-  CreateAndConnectStandard(
-      "ws://localhost/",
-      "/",
-      NoSubProtocols(),
-      "http://localhost",
-      "", "Upgrade: HTTP/2.0\r\n");
+  CreateAndConnectStandard("ws://localhost/", "localhost", "/",
+                           NoSubProtocols(), "http://localhost", "",
+                           "Upgrade: HTTP/2.0\r\n");
   RunUntilIdle();
   EXPECT_TRUE(has_failed());
   EXPECT_EQ("Error during WebSocket handshake: "
             "'Upgrade' header must not appear more than once in a response",
             failure_message());
 }
 
 // There must only be one correct upgrade header.
 TEST_F(WebSocketStreamCreateTest, IncorrectUpgradeHeader) {
   static const char kMissingUpgradeResponse[] =
       "HTTP/1.1 101 Switching Protocols\r\n"
       "Connection: Upgrade\r\n"
       "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n"
       "Upgrade: hogefuga\r\n"
       "\r\n";
-  CreateAndConnectCustomResponse("ws://localhost/",
-                                 "/",
-                                 NoSubProtocols(),
-                                 "http://localhost",
-                                 "",
+  CreateAndConnectCustomResponse("ws://localhost/", "localhost", "/",
+                                 NoSubProtocols(), "http://localhost", "",
                                  kMissingUpgradeResponse);
   RunUntilIdle();
   EXPECT_TRUE(has_failed());
   EXPECT_EQ("Error during WebSocket handshake: "
             "'Upgrade' header value is not 'WebSocket': hogefuga",
             failure_message());
 }
 
 // Connection header must be present.
 TEST_F(WebSocketStreamCreateTest, MissingConnectionHeader) {
   static const char kMissingConnectionResponse[] =
       "HTTP/1.1 101 Switching Protocols\r\n"
       "Upgrade: websocket\r\n"
       "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n"
       "\r\n";
-  CreateAndConnectCustomResponse("ws://localhost/",
-                                 "/",
-                                 NoSubProtocols(),
-                                 "http://localhost",
-                                 "",
+  CreateAndConnectCustomResponse("ws://localhost/", "localhost", "/",
+                                 NoSubProtocols(), "http://localhost", "",
                                  kMissingConnectionResponse);
   RunUntilIdle();
   EXPECT_TRUE(has_failed());
   EXPECT_EQ("Error during WebSocket handshake: "
             "'Connection' header is missing",
             failure_message());
 }
 
 // Connection header must contain "Upgrade".
 TEST_F(WebSocketStreamCreateTest, IncorrectConnectionHeader) {
   static const char kMissingConnectionResponse[] =
       "HTTP/1.1 101 Switching Protocols\r\n"
       "Upgrade: websocket\r\n"
       "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n"
       "Connection: hogefuga\r\n"
       "\r\n";
-  CreateAndConnectCustomResponse("ws://localhost/",
-                                 "/",
-                                 NoSubProtocols(),
-                                 "http://localhost",
-                                 "",
+  CreateAndConnectCustomResponse("ws://localhost/", "localhost", "/",
+                                 NoSubProtocols(), "http://localhost", "",
                                  kMissingConnectionResponse);
   RunUntilIdle();
   EXPECT_TRUE(has_failed());
   EXPECT_EQ("Error during WebSocket handshake: "
             "'Connection' header value must contain 'Upgrade'",
             failure_message());
 }
 
 // Connection header is permitted to contain other tokens.
 TEST_F(WebSocketStreamCreateTest, AdditionalTokenInConnectionHeader) {
   static const char kAdditionalConnectionTokenResponse[] =
       "HTTP/1.1 101 Switching Protocols\r\n"
       "Upgrade: websocket\r\n"
       "Connection: Upgrade, Keep-Alive\r\n"
       "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n"
       "\r\n";
-  CreateAndConnectCustomResponse("ws://localhost/",
-                                 "/",
-                                 NoSubProtocols(),
-                                 "http://localhost",
-                                 "",
+  CreateAndConnectCustomResponse("ws://localhost/", "localhost", "/",
+                                 NoSubProtocols(), "http://localhost", "",
                                  kAdditionalConnectionTokenResponse);
   RunUntilIdle();
   EXPECT_FALSE(has_failed());
   EXPECT_TRUE(stream_);
 }
 
 // Sec-WebSocket-Accept header must be present.
 TEST_F(WebSocketStreamCreateTest, MissingSecWebSocketAccept) {
   static const char kMissingAcceptResponse[] =
       "HTTP/1.1 101 Switching Protocols\r\n"
       "Upgrade: websocket\r\n"
       "Connection: Upgrade\r\n"
       "\r\n";
-  CreateAndConnectCustomResponse("ws://localhost/",
-                                 "/",
-                                 NoSubProtocols(),
-                                 "http://localhost",
-                                 "",
+  CreateAndConnectCustomResponse("ws://localhost/", "localhost", "/",
+                                 NoSubProtocols(), "http://localhost", "",
                                  kMissingAcceptResponse);
   RunUntilIdle();
   EXPECT_TRUE(has_failed());
   EXPECT_EQ("Error during WebSocket handshake: "
             "'Sec-WebSocket-Accept' header is missing",
             failure_message());
 }
 
 // Sec-WebSocket-Accept header must match the key that was sent.
 TEST_F(WebSocketStreamCreateTest, WrongSecWebSocketAccept) {
   static const char kIncorrectAcceptResponse[] =
       "HTTP/1.1 101 Switching Protocols\r\n"
       "Upgrade: websocket\r\n"
       "Connection: Upgrade\r\n"
       "Sec-WebSocket-Accept: x/byyPZ2tOFvJCGkkugcKvqhhPk=\r\n"
       "\r\n";
-  CreateAndConnectCustomResponse("ws://localhost/",
-                                 "/",
-                                 NoSubProtocols(),
-                                 "http://localhost",
-                                 "",
+  CreateAndConnectCustomResponse("ws://localhost/", "localhost", "/",
+                                 NoSubProtocols(), "http://localhost", "",
                                  kIncorrectAcceptResponse);
   RunUntilIdle();
   EXPECT_TRUE(has_failed());
   EXPECT_EQ("Error during WebSocket handshake: "
             "Incorrect 'Sec-WebSocket-Accept' header value",
             failure_message());
 }
 
 // Cancellation works.
 TEST_F(WebSocketStreamCreateTest, Cancellation) {
-  CreateAndConnectStandard(
-      "ws://localhost/", "/", NoSubProtocols(), "http://localhost", "", "");
+  CreateAndConnectStandard("ws://localhost/", "localhost", "/",
+                           NoSubProtocols(), "http://localhost", "", "");
   stream_request_.reset();
   RunUntilIdle();
   EXPECT_FALSE(has_failed());
   EXPECT_FALSE(stream_);
   EXPECT_FALSE(request_info_);
   EXPECT_FALSE(response_info_);
 }
 
 // Connect failure must look just like negotiation failure.
 TEST_F(WebSocketStreamCreateTest, ConnectionFailure) {
@@ skipping 45 matching lines @@
   EXPECT_EQ("WebSocket opening handshake timed out", failure_message());
   ASSERT_TRUE(weak_timer.get());
   EXPECT_FALSE(weak_timer->IsRunning());
 }
 
 // When the connection establishes the timer should be stopped.
 TEST_F(WebSocketStreamCreateTest, HandshakeTimerOnSuccess) {
   scoped_ptr<MockWeakTimer> timer(new MockWeakTimer(false, false));
   base::WeakPtr<MockWeakTimer> weak_timer = timer->AsWeakPtr();
 
-  CreateAndConnectStandard("ws://localhost/",
-                           "/",
-                           NoSubProtocols(),
-                           "http://localhost",
-                           "",
-                           "",
+  CreateAndConnectStandard("ws://localhost/", "localhost", "/",
+                           NoSubProtocols(), "http://localhost", "", "",
                            timer.Pass());
   ASSERT_TRUE(weak_timer);
   EXPECT_TRUE(weak_timer->IsRunning());
 
   RunUntilIdle();
   EXPECT_FALSE(has_failed());
   EXPECT_TRUE(stream_);
   ASSERT_TRUE(weak_timer);
   EXPECT_FALSE(weak_timer->IsRunning());
 }
@@ skipping 53 matching lines @@
   stream_request_.reset();
   RunUntilIdle();
   EXPECT_FALSE(has_failed());
   EXPECT_FALSE(stream_);
   EXPECT_TRUE(request_info_);
   EXPECT_FALSE(response_info_);
 }
 
 // Cancellation during read of the response headers works.
 TEST_F(WebSocketStreamCreateTest, CancellationDuringRead) {
-  std::string request = WebSocketStandardRequest("/", "http://localhost", "");
+  std::string request =
+      WebSocketStandardRequest("/", "localhost", "http://localhost", "");
   MockWrite writes[] = {MockWrite(ASYNC, 0, request.c_str())};
   MockRead reads[] = {
     MockRead(ASYNC, 1, "HTTP/1.1 101 Switching Protocols\r\nUpgr"),
   };
   scoped_ptr<DeterministicSocketData> socket_data(
       BuildSocketData(reads, writes));
   socket_data->SetStop(1);
   DeterministicSocketData* socket_data_raw_ptr = socket_data.get();
   CreateAndConnectRawExpectations("ws://localhost/",
                                   NoSubProtocols(),
@@ skipping 11 matching lines @@
 // Over-size response headers (> 256KB) should not cause a crash.  This is a
 // regression test for crbug.com/339456. It is based on the layout test
 // "cookie-flood.html".
 TEST_F(WebSocketStreamCreateTest, VeryLargeResponseHeaders) {
   std::string set_cookie_headers;
   set_cookie_headers.reserve(45 * 10000);
   for (int i = 0; i < 10000; ++i) {
     set_cookie_headers +=
         base::StringPrintf("Set-Cookie: WK-websocket-test-flood-%d=1\r\n", i);
   }
-  CreateAndConnectStandard("ws://localhost/", "/", NoSubProtocols(),
-                           "http://localhost", "", set_cookie_headers);
+  CreateAndConnectStandard("ws://localhost/", "localhost", "/",
+                           NoSubProtocols(), "http://localhost", "",
+                           set_cookie_headers);
   RunUntilIdle();
   EXPECT_TRUE(has_failed());
   EXPECT_FALSE(response_info_);
 }
 
 // If the remote host closes the connection without sending headers, we should
 // log the console message "Connection closed before receiving a handshake
 // response".
 TEST_F(WebSocketStreamCreateTest, NoResponse) {
-  std::string request = WebSocketStandardRequest("/", "http://localhost", "");
+  std::string request =
+      WebSocketStandardRequest("/", "localhost", "http://localhost", "");
   MockWrite writes[] = {MockWrite(ASYNC, request.data(), request.size(), 0)};
   MockRead reads[] = {MockRead(ASYNC, 0, 1)};
   scoped_ptr<DeterministicSocketData> socket_data(
       BuildSocketData(reads, writes));
   DeterministicSocketData* socket_data_raw_ptr = socket_data.get();
   CreateAndConnectRawExpectations("ws://localhost/",
                                   NoSubProtocols(),
                                   "http://localhost",
                                   socket_data.Pass());
   socket_data_raw_ptr->RunFor(2);
@@ skipping 27 matching lines @@
 TEST_F(WebSocketStreamCreateTest, SelfSignedCertificateSuccess) {
   scoped_ptr<SSLSocketDataProvider> ssl_data(
       new SSLSocketDataProvider(ASYNC, ERR_CERT_AUTHORITY_INVALID));
   ssl_data->cert =
       ImportCertFromFile(GetTestCertsDirectory(), "unittest.selfsigned.der");
   ASSERT_TRUE(ssl_data->cert.get());
   ssl_data_.push_back(ssl_data.release());
   ssl_data.reset(new SSLSocketDataProvider(ASYNC, OK));
   ssl_data_.push_back(ssl_data.release());
   url_request_context_host_.AddRawExpectations(BuildNullSocketData());
-  CreateAndConnectStandard(
-      "wss://localhost/", "/", NoSubProtocols(), "http://localhost", "", "");
+  CreateAndConnectStandard("wss://localhost/", "localhost", "/",
+                           NoSubProtocols(), "http://localhost", "", "");
   RunUntilIdle();
   ASSERT_TRUE(ssl_error_callbacks_);
   ssl_error_callbacks_->ContinueSSLRequest();
   RunUntilIdle();
   EXPECT_FALSE(has_failed());
   EXPECT_TRUE(stream_);
 }
 
 // If the server requests authorisation, but we have no credentials, the
 // connection should fail cleanly.
 TEST_F(WebSocketStreamCreateBasicAuthTest, FailureNoCredentials) {
-  CreateAndConnectCustomResponse("ws://localhost/",
-                                 "/",
-                                 NoSubProtocols(),
-                                 "http://localhost",
-                                 "",
+  CreateAndConnectCustomResponse("ws://localhost/", "localhost", "/",
+                                 NoSubProtocols(), "http://localhost", "",
                                  kUnauthorizedResponse);
   RunUntilIdle();
   EXPECT_TRUE(has_failed());
   EXPECT_EQ("HTTP Authentication failed; no valid credentials available",
             failure_message());
   EXPECT_TRUE(response_info_);
 }
 
 TEST_F(WebSocketStreamCreateBasicAuthTest, SuccessPasswordInUrl) {
   CreateAndConnectAuthHandshake("ws://foo:bar@localhost/",
@@ skipping 32 matching lines @@
   ASSERT_TRUE(response_info_);
   EXPECT_EQ(101, response_info_->status_code);
 }
 
 TEST_F(WebSocketStreamCreateUMATest, Incomplete) {
   const std::string name("Net.WebSocket.HandshakeResult");
   scoped_ptr<base::HistogramSamples> original(GetSamples(name));
 
   {
     StreamCreation creation;
-    creation.CreateAndConnectStandard("ws://localhost/",
-                                      "/",
+    creation.CreateAndConnectStandard("ws://localhost/", "localhost", "/",
                                       creation.NoSubProtocols(),
-                                      "http://localhost",
-                                      "",
-                                      "");
+                                      "http://localhost", "", "");
   }
 
   scoped_ptr<base::HistogramSamples> samples(GetSamples(name));
   ASSERT_TRUE(samples);
   if (original) {
     samples->Subtract(*original);  // Cancel the original values.
   }
   EXPECT_EQ(1, samples->GetCount(INCOMPLETE));
   EXPECT_EQ(0, samples->GetCount(CONNECTED));
   EXPECT_EQ(0, samples->GetCount(FAILED));
 }
 
 TEST_F(WebSocketStreamCreateUMATest, Connected) {
   const std::string name("Net.WebSocket.HandshakeResult");
   scoped_ptr<base::HistogramSamples> original(GetSamples(name));
 
   {
     StreamCreation creation;
-    creation.CreateAndConnectStandard("ws://localhost/",
-                                      "/",
+    creation.CreateAndConnectStandard("ws://localhost/", "localhost", "/",
                                       creation.NoSubProtocols(),
-                                      "http://localhost",
-                                      "",
-                                      "");
+                                      "http://localhost", "", "");
     creation.RunUntilIdle();
   }
 
   scoped_ptr<base::HistogramSamples> samples(GetSamples(name));
   ASSERT_TRUE(samples);
   if (original) {
     samples->Subtract(*original);  // Cancel the original values.
   }
   EXPECT_EQ(0, samples->GetCount(INCOMPLETE));
   EXPECT_EQ(1, samples->GetCount(CONNECTED));
   EXPECT_EQ(0, samples->GetCount(FAILED));
 }
 
 TEST_F(WebSocketStreamCreateUMATest, Failed) {
   const std::string name("Net.WebSocket.HandshakeResult");
   scoped_ptr<base::HistogramSamples> original(GetSamples(name));
 
   {
     StreamCreation creation;
     static const char kInvalidStatusCodeResponse[] =
         "HTTP/1.1 200 OK\r\n"
         "Upgrade: websocket\r\n"
         "Connection: Upgrade\r\n"
         "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n"
         "\r\n";
-    creation.CreateAndConnectCustomResponse("ws://localhost/",
-                                            "/",
-                                            creation.NoSubProtocols(),
-                                            "http://localhost",
-                                            "",
-                                            kInvalidStatusCodeResponse);
+    creation.CreateAndConnectCustomResponse(
+        "ws://localhost/", "localhost", "/", creation.NoSubProtocols(),
+        "http://localhost", "", kInvalidStatusCodeResponse);
     creation.RunUntilIdle();
   }
 
   scoped_ptr<base::HistogramSamples> samples(GetSamples(name));
   ASSERT_TRUE(samples);
   if (original) {
     samples->Subtract(*original);  // Cancel the original values.
   }
   EXPECT_EQ(1, samples->GetCount(INCOMPLETE));
   EXPECT_EQ(0, samples->GetCount(CONNECTED));
   EXPECT_EQ(0, samples->GetCount(FAILED));
 }
 
 }  // namespace
 }  // namespace net