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

net/dns/dns_response_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/dns/dns_response.h"
 
 #include "base/time.h"
 #include "net/base/address_list.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_util.h"
@@ skipping 281 matching lines @@
         kT3CanonName,
         kT3TTL,
       },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) {
     const TestCase& t = cases[i];
     DnsResponse response(t.response_data, t.response_size, t.query_size);
     AddressList addr_list;
     base::TimeDelta ttl;
-    EXPECT_EQ(DnsResponse::DNS_PARSE_OK,
+    EXPECT_EQ(DnsResponse::DNS_SUCCESS,
               response.ParseToAddressList(&addr_list, &ttl));
     std::vector<const char*> expected_addresses(
         t.expected_addresses,
         t.expected_addresses + t.num_expected_addresses);
     VerifyAddressList(expected_addresses, addr_list);
     EXPECT_EQ(t.expected_cname, addr_list.canonical_name());
     EXPECT_EQ(base::TimeDelta::FromSeconds(t.expected_ttl_sec), ttl);
   }
 }
 
@@ skipping 109 matching lines @@
     { kResponseNameMismatch, arraysize(kResponseNameMismatch),
       DnsResponse::DNS_NAME_MISMATCH },
     { kResponseNameMismatchInChain, arraysize(kResponseNameMismatchInChain),
       DnsResponse::DNS_NAME_MISMATCH },
     { kResponseSizeMismatch, arraysize(kResponseSizeMismatch),
       DnsResponse::DNS_SIZE_MISMATCH },
     { kResponseCNAMEAfterAddress, arraysize(kResponseCNAMEAfterAddress),
       DnsResponse::DNS_CNAME_AFTER_ADDRESS },
     { kResponseTTLMismatch, arraysize(kResponseTTLMismatch),
       DnsResponse::DNS_ADDRESS_TTL_MISMATCH },
-    // Not actually a failure, just an empty result.
     { kResponseNoAddresses, arraysize(kResponseNoAddresses),
-      DnsResponse::DNS_PARSE_OK },
+      DnsResponse::DNS_NO_ADDRESSES },
   };
 
   const size_t kQuerySize = 12 + 7;
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) {
     const TestCase& t = cases[i];
 
     DnsResponse response(t.data, t.size, kQuerySize);
     AddressList addr_list;
     base::TimeDelta ttl;
     EXPECT_EQ(t.expected_result,
               response.ParseToAddressList(&addr_list, &ttl));
   }
 }
 
 }  // namespace
 
 }  // namespace net