Reimplements net::AddressList without struct addrinfo.

chrome/browser/extensions/api/dns/dns_api.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/browser/extensions/api/dns/dns_api.h"
 
 #include "base/bind.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/common/extensions/api/experimental.dns.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_errors.h"
-#include "net/base/net_util.h"
 
 using content::BrowserThread;
 using extensions::api::experimental_dns::ResolveCallbackResolveInfo;
 
 namespace Resolve = extensions::api::experimental_dns::Resolve;
 
 namespace extensions {
 
 namespace {
 
@@ skipping 63 matching lines @@
 void DnsResolveFunction::RespondOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   SendResponse(response_);
 }
 
 void DnsResolveFunction::OnLookupFinished(int resolve_result) {
   scoped_ptr<ResolveCallbackResolveInfo> resolve_info(
       new ResolveCallbackResolveInfo());
   resolve_info->result_code = resolve_result;
   if (resolve_result == net::OK) {
-    const struct addrinfo* head = addresses_->head();
-    DCHECK(head);
+    DCHECK(!addresses_->empty());
     resolve_info->address.reset(
-        new std::string(net::NetAddressToString(head)));
+        new std::string(addresses_->front().ToStringWithoutPort()));
   }
   result_.reset(Resolve::Result::Create(*resolve_info));
   response_ = true;
 
   bool post_task_result = BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&DnsResolveFunction::RespondOnUIThread, this));
   DCHECK(post_task_result);
 
   Release();  // Added in WorkOnIOThread().
 }
 
 }  // namespace extensions