Revert 151586 - [net/dns] Resolve AF_UNSPEC on dual-stacked systems. Sort addresses according to RF…

net/base/host_resolver_impl_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/base/host_resolver_impl.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 1218 matching lines @@
   DnsConfig config;
   config.nameservers.push_back(IPEndPoint(dns_ip, dns_protocol::kDefaultPort));
   EXPECT_TRUE(config.IsValid());
   return config;
 }
 
 // Specialized fixture for tests of DnsTask.
 class HostResolverImplDnsTest : public HostResolverImplTest {
  protected:
   virtual void SetUp() OVERRIDE {
-    AddDnsRule("er", dns_protocol::kTypeA, MockDnsClientRule::FAIL_SYNC);
-    AddDnsRule("er", dns_protocol::kTypeAAAA, MockDnsClientRule::FAIL_SYNC);
-    AddDnsRule("nx", dns_protocol::kTypeA, MockDnsClientRule::FAIL_ASYNC);
-    AddDnsRule("nx", dns_protocol::kTypeAAAA, MockDnsClientRule::FAIL_ASYNC);
-    AddDnsRule("ok", dns_protocol::kTypeA, MockDnsClientRule::OK);
-    AddDnsRule("ok", dns_protocol::kTypeAAAA, MockDnsClientRule::OK);
-    AddDnsRule("4ok", dns_protocol::kTypeA, MockDnsClientRule::OK);
-    AddDnsRule("4ok", dns_protocol::kTypeAAAA, MockDnsClientRule::EMPTY);
-    AddDnsRule("6ok", dns_protocol::kTypeA, MockDnsClientRule::EMPTY);
-    AddDnsRule("6ok", dns_protocol::kTypeAAAA, MockDnsClientRule::OK);
-    AddDnsRule("4nx", dns_protocol::kTypeA, MockDnsClientRule::OK);
-    AddDnsRule("4nx", dns_protocol::kTypeAAAA, MockDnsClientRule::FAIL_ASYNC);
-    CreateResolver();
-  }
-
-  void CreateResolver() {
     config_service_ = new MockDnsConfigService();
     resolver_.reset(new HostResolverImpl(
         HostCache::CreateDefaultCache(),
         DefaultLimits(),
         DefaultParams(proc_),
         scoped_ptr<DnsConfigService>(config_service_),
-        CreateMockDnsClient(DnsConfig(), dns_rules_),
+        CreateMockDnsClient(DnsConfig()),
         NULL));
   }
 
-  // Adds a rule to |dns_rules_|. Must be followed by |CreateResolver| to apply.
-  void AddDnsRule(const std::string& prefix,
-                  uint16 qtype,
-                  MockDnsClientRule::Result result) {
-    MockDnsClientRule rule = { prefix, qtype, result };
-    dns_rules_.push_back(rule);
-  }
-
   void ChangeDnsConfig(const DnsConfig& config) {
     config_service_->ChangeConfig(config);
     config_service_->ChangeHosts(config.hosts);
   }
 
-  MockDnsClientRuleList dns_rules_;
   // Owned by |resolver_|.
   MockDnsConfigService* config_service_;
 };
 
 // TODO(szym): Test AbortAllInProgressJobs due to DnsConfig change.
 
 // TODO(cbentzel): Test a mix of requests with different HostResolverFlags.
 
 // Test successful and fallback resolutions in HostResolverImpl::DnsTask.
 TEST_F(HostResolverImplDnsTest, DnsTask) {
@@ skipping 27 matching lines @@
   EXPECT_TRUE(requests_[1]->HasOneAddress("127.0.0.1", 80));
   // Fallback to ProcTask.
   EXPECT_EQ(ERR_NAME_NOT_RESOLVED, requests_[2]->result());
   EXPECT_EQ(ERR_NAME_NOT_RESOLVED, requests_[3]->result());
   EXPECT_EQ(OK, requests_[4]->result());
   EXPECT_TRUE(requests_[4]->HasOneAddress("192.168.1.101", 80));
   EXPECT_EQ(OK, requests_[5]->result());
   EXPECT_TRUE(requests_[5]->HasOneAddress("192.168.1.102", 80));
 }
 
-TEST_F(HostResolverImplDnsTest, DnsTaskUnspec) {
-  ChangeDnsConfig(CreateValidDnsConfig());
-
-  proc_->AddRuleForAllFamilies("4nx", "192.168.1.101");
-  // All other hostnames will fail in proc_.
-
-  EXPECT_EQ(ERR_IO_PENDING, CreateRequest("ok", 80)->Resolve());
-  EXPECT_EQ(ERR_IO_PENDING, CreateRequest("4ok", 80)->Resolve());
-  EXPECT_EQ(ERR_IO_PENDING, CreateRequest("6ok", 80)->Resolve());
-  EXPECT_EQ(ERR_IO_PENDING, CreateRequest("4nx", 80)->Resolve());
-
-  proc_->SignalMultiple(requests_.size());
-
-  for (size_t i = 0; i < requests_.size(); ++i)
-    EXPECT_EQ(OK, requests_[i]->WaitForResult()) << i;
-
-  EXPECT_EQ(2u, requests_[0]->NumberOfAddresses());
-  EXPECT_TRUE(requests_[0]->HasAddress("127.0.0.1", 80));
-  EXPECT_TRUE(requests_[0]->HasAddress("::1", 80));
-  EXPECT_EQ(1u, requests_[1]->NumberOfAddresses());
-  EXPECT_TRUE(requests_[1]->HasAddress("127.0.0.1", 80));
-  EXPECT_EQ(1u, requests_[2]->NumberOfAddresses());
-  EXPECT_TRUE(requests_[2]->HasAddress("::1", 80));
-  EXPECT_EQ(1u, requests_[3]->NumberOfAddresses());
-  EXPECT_TRUE(requests_[3]->HasAddress("192.168.1.101", 80));
-}
-
 TEST_F(HostResolverImplDnsTest, ServeFromHosts) {
   // Initially, use empty HOSTS file.
   ChangeDnsConfig(CreateValidDnsConfig());
 
-  proc_->AddRuleForAllFamilies("", "");  // Default to failures.
+  proc_->AddRuleForAllFamilies("", "0.0.0.0");  // Default to failures.
   proc_->SignalMultiple(1u);  // For the first request which misses.
 
   Request* req0 = CreateRequest("er_ipv4", 80);
   EXPECT_EQ(ERR_IO_PENDING, req0->Resolve());
   EXPECT_EQ(ERR_NAME_NOT_RESOLVED, req0->WaitForResult());
 
   IPAddressNumber local_ipv4, local_ipv6;
   ASSERT_TRUE(ParseIPLiteralToNumber("127.0.0.1", &local_ipv4));
   ASSERT_TRUE(ParseIPLiteralToNumber("::1", &local_ipv6));
 
@@ skipping 30 matching lines @@
 
   // Request with upper case.
   Request* req6 = CreateRequest("er_IPV4", 80);
   EXPECT_EQ(OK, req6->Resolve());
   EXPECT_TRUE(req6->HasOneAddress("127.0.0.1", 80));
 }
 
 TEST_F(HostResolverImplDnsTest, BypassDnsTask) {
   ChangeDnsConfig(CreateValidDnsConfig());
 
-  proc_->AddRuleForAllFamilies("", "");  // Default to failures.
+  proc_->AddRuleForAllFamilies("", "0.0.0.0");  // Default to failures.
 
   EXPECT_EQ(ERR_IO_PENDING, CreateRequest("ok.local", 80)->Resolve());
   EXPECT_EQ(ERR_IO_PENDING, CreateRequest("ok.local.", 80)->Resolve());
   EXPECT_EQ(ERR_IO_PENDING, CreateRequest("oklocal", 80)->Resolve());
   EXPECT_EQ(ERR_IO_PENDING, CreateRequest("oklocal.", 80)->Resolve());
   EXPECT_EQ(ERR_IO_PENDING, CreateRequest("ok", 80)->Resolve());
 
   proc_->SignalMultiple(requests_.size());
 
   for (size_t i = 0; i < 2; ++i)
     EXPECT_EQ(ERR_NAME_NOT_RESOLVED, requests_[i]->WaitForResult()) << i;
 
   for (size_t i = 2; i < requests_.size(); ++i)
     EXPECT_EQ(OK, requests_[i]->WaitForResult()) << i;
 }
 
 }  // namespace net