Reland of [chromedriver] Listen on IPv6 on IPv6-only hosts (part 2).

chrome/test/chromedriver/net/websocket.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 "chrome/test/chromedriver/net/websocket.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/json/json_writer.h"
 #include "base/rand_util.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
+#include "base/values.h"
 #include "build/build_config.h"
 #include "net/base/address_list.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/base/sys_addrinfo.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 #include "net/websockets/websocket_frame.h"
@@ skipping 37 matching lines @@
 
 void WebSocket::Connect(const net::CompletionCallback& callback) {
   CHECK(thread_checker_.CalledOnValidThread());
   CHECK_EQ(INITIALIZED, state_);
 
   net::IPAddress address;
   net::AddressList addresses;
   uint16_t port = static_cast<uint16_t>(url_.EffectiveIntPort());
   if (ParseURLHostnameToAddress(url_.host(), &address)) {
     addresses = net::AddressList::CreateFromIPAddress(address, port);
-  } else if (!ResolveHost(url_.HostNoBrackets(), port, &addresses)) {
-    callback.Run(net::ERR_ADDRESS_UNREACHABLE);
-    return;
+  } else {
+    if (!ResolveHost(url_.HostNoBrackets(), port, &addresses)) {
+      callback.Run(net::ERR_ADDRESS_UNREACHABLE);
+      return;
+    }
+    base::ListValue endpoints;
+    for (auto endpoint : addresses)
+      endpoints.AppendString(endpoint.ToStringWithoutPort());
+    std::string json;
+    CHECK(base::JSONWriter::Write(endpoints, &json));
+    VLOG(0) << "resolved " << url_.HostNoBrackets() << " to " << json;
   }
 
   net::NetLog::Source source;
   socket_.reset(new net::TCPClientSocket(addresses, NULL, NULL, source));
 
   state_ = CONNECTING;
   connect_callback_ = callback;
   int code = socket_->Connect(base::Bind(
       &WebSocket::OnSocketConnect, base::Unretained(this)));
   if (code != net::ERR_IO_PENDING)
@@ skipping 18 matching lines @@
 
   std::string masked_message = message;
   net::MaskWebSocketFramePayload(
       masking_key, 0, &masked_message[0], masked_message.length());
   Write(header_str + masked_message);
   return true;
 }
 
 void WebSocket::OnSocketConnect(int code) {
   if (code != net::OK) {
+    VLOG(1) << "failed to connect to " << url_.HostNoBrackets() << " (error "
+            << code << ")";
     Close(code);
     return;
   }
 
   base::Base64Encode(base::RandBytesAsString(16), &sec_key_);
   std::string handshake = base::StringPrintf(
       "GET %s HTTP/1.1\r\n"
       "Host: %s\r\n"
       "Upgrade: websocket\r\n"
       "Connection: Upgrade\r\n"
@@ skipping 125 matching lines @@
 
 void WebSocket::Close(int code) {
   socket_->Disconnect();
   if (!connect_callback_.is_null())
     InvokeConnectCallback(code);
   if (state_ == OPEN)
     listener_->OnClose();
 
   state_ = CLOSED;
 }