Use net::HostPortPair::HostForURL to fix IPv6 in URLs

chrome/browser/local_discovery/privet_http_asynchronous_factory_impl.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.
 
 #include "chrome/browser/local_discovery/privet_http_asynchronous_factory_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/local_discovery/privet_http_impl.h"
 #include "chrome/browser/local_discovery/service_discovery_shared_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "net/base/net_util.h"
 
 namespace local_discovery {
 
-namespace {
-
-std::string IPAddressToHostString(const net::IPAddressNumber& address) {
-  std::string address_str = net::IPAddressToString(address);
-
-  // IPv6 addresses need to be surrounded by brackets.
-  if (address.size() == net::kIPv6AddressSize) {
-    address_str = base::StringPrintf("[%s]", address_str.c_str());
-  }
-
-  return address_str;
-}
-
-}  // namespace
-
 PrivetHTTPAsynchronousFactoryImpl::PrivetHTTPAsynchronousFactoryImpl(
     net::URLRequestContextGetter* request_context)
     : request_context_(request_context) {
 }
 
 PrivetHTTPAsynchronousFactoryImpl::~PrivetHTTPAsynchronousFactoryImpl() {
 }
 
 scoped_ptr<PrivetHTTPResolution>
 PrivetHTTPAsynchronousFactoryImpl::CreatePrivetHTTP(
@@ skipping 70 matching lines @@
     return;
   }
 
   net::IPAddressNumber address = address_ipv4;
   if (address.empty())
     address = address_ipv6;
 
   DCHECK(!address.empty());
 
   net::HostPortPair new_address =
-      net::HostPortPair(IPAddressToHostString(address), port);
+      net::HostPortPair::FromIPEndPoint(net::IPEndPoint(address, port));
   callback.Run(scoped_ptr<PrivetHTTPClient>(
       new PrivetHTTPClientImpl(name_, new_address, request_context_.get())));
 }
 
 }  // namespace local_discovery