Reimplements net::AddressList without struct addrinfo.

net/proxy/proxy_resolver_js_bindings_unittest.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 "net/proxy/proxy_resolver_js_bindings.h"
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "net/base/address_list.h"
 #include "net/base/host_cache.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/base/net_log_unittest.h"
 #include "net/base/net_util.h"
-#include "net/base/sys_addrinfo.h"
 #include "net/base/test_completion_callback.h"
 #include "net/proxy/proxy_resolver_request_context.h"
 #include "net/proxy/sync_host_resolver.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
 // This is a HostResolver that synchronously resolves all hosts to the
@@ skipping 133 matching lines @@
   host_resolver->rules()->AddRuleForAddressFamily(
       "foo", ADDRESS_FAMILY_UNSPECIFIED, "192.168.2.1");
   host_resolver->rules()->AddRuleForAddressFamily(
       "*", ADDRESS_FAMILY_UNSPECIFIED, "192.168.2.2");
 
   // Verify that our mock setups works as expected, and we get different results
   // depending if the address family was IPV4_ONLY or not.
   HostResolver::RequestInfo info(HostPortPair("foo", 80));
   AddressList address_list;
   EXPECT_EQ(OK, host_resolver->Resolve(info, &address_list, BoundNetLog()));
-  EXPECT_EQ("192.168.2.1", NetAddressToString(address_list.head()));
+  ASSERT_FALSE(address_list.empty());
+  EXPECT_EQ("192.168.2.1", address_list.front().ToStringWithoutPort());
 
   info.set_address_family(ADDRESS_FAMILY_IPV4);
   EXPECT_EQ(OK, host_resolver->Resolve(info, &address_list, BoundNetLog()));
-  EXPECT_EQ("192.168.1.1", NetAddressToString(address_list.head()));
+  ASSERT_FALSE(address_list.empty());
+  EXPECT_EQ("192.168.1.1", address_list.front().ToStringWithoutPort());
 
   std::string ip_address;
   // Now the actual test.
   EXPECT_TRUE(bindings->MyIpAddress(&ip_address));
   EXPECT_EQ("192.168.1.2", ip_address);  // IPv4 restricted.
 
   EXPECT_TRUE(bindings->DnsResolve("foo", &ip_address));
   EXPECT_EQ("192.168.1.1", ip_address);  // IPv4 restricted.
 
   EXPECT_TRUE(bindings->DnsResolve("foo2", &ip_address));
@@ skipping 169 matching lines @@
   global_log.GetEntries(&global_log_entries);
   EXPECT_EQ(2u, global_log_entries.size());
   EXPECT_TRUE(LogContainsEvent(
       global_log_entries, 1, NetLog::TYPE_PAC_JAVASCRIPT_ALERT,
       NetLog::PHASE_NONE));
 }
 
 }  // namespace
 
 }  // namespace net