Revert 56384 - Don't resolve IP literals....

net/base/host_resolver_impl_unittest.cc

 // Copyright (c) 2010 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/base/host_resolver_impl.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
@@ skipping 381 matching lines @@
   resolver_proc->AllowDirectLookup("*");
 
   // Resolve a plain IPv6 address.  Don't worry about [brackets], because
   // the caller should have removed them.
   scoped_refptr<HostResolver> host_resolver(
       CreateHostResolverImpl(resolver_proc));
   AddressList adrlist;
   const int kPortnum = 5555;
   HostResolver::RequestInfo info("2001:db8::1", kPortnum);
   int err = host_resolver->Resolve(info, &adrlist, NULL, NULL, BoundNetLog());
+  // On computers without IPv6 support, getaddrinfo cannot convert IPv6
+  // address literals to addresses (getaddrinfo returns EAI_NONAME).  So this
+  // test has to allow host_resolver->Resolve to fail.
+  if (err == ERR_NAME_NOT_RESOLVED)
+    return;
   EXPECT_EQ(OK, err);
 
   const struct addrinfo* ainfo = adrlist.head();
   EXPECT_EQ(static_cast<addrinfo*>(NULL), ainfo->ai_next);
   EXPECT_EQ(sizeof(struct sockaddr_in6), ainfo->ai_addrlen);
 
   const struct sockaddr* sa = ainfo->ai_addr;
   const struct sockaddr_in6* sa_in6 = (const struct sockaddr_in6*) sa;
   EXPECT_TRUE(htons(kPortnum) == sa_in6->sin6_port);
 
@@ skipping 1078 matching lines @@
   EXPECT_EQ("192.1.98.2", NetAddressToString(addrlist[1].head()));
   EXPECT_EQ("192.1.98.1", NetAddressToString(addrlist[2].head()));
   EXPECT_EQ("192.1.98.1", NetAddressToString(addrlist[3].head()));
 }
 
 // TODO(cbentzel): Test a mix of requests with different HostResolverFlags.
 
 }  // namespace
 
 }  // namespace net