Index: net/base/host_resolver_impl_unittest.cc |
diff --git a/net/base/host_resolver_impl_unittest.cc b/net/base/host_resolver_impl_unittest.cc |
index bd19f0b87e046db4c04ed4976ac82055729af743..dc7ff13c362a061dc8591a42dfc1291a7366b7ba 100644 |
--- a/net/base/host_resolver_impl_unittest.cc |
+++ b/net/base/host_resolver_impl_unittest.cc |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
+// 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. |
@@ -73,7 +73,8 @@ class CapturingHostResolverProc : public HostResolverProc { |
public: |
struct CaptureEntry { |
CaptureEntry(const std::string& hostname, AddressFamily address_family) |
- : hostname(hostname), address_family(address_family) {} |
+ : hostname(hostname), |
+ address_family(address_family) {} |
std::string hostname; |
AddressFamily address_family; |
}; |
@@ -90,13 +91,15 @@ class CapturingHostResolverProc : public HostResolverProc { |
virtual int Resolve(const std::string& hostname, |
AddressFamily address_family, |
+ HostResolverFlags host_resolver_flags, |
AddressList* addrlist) { |
event_.Wait(); |
{ |
AutoLock l(lock_); |
capture_list_.push_back(CaptureEntry(hostname, address_family)); |
} |
- return ResolveUsingPrevious(hostname, address_family, addrlist); |
+ return ResolveUsingPrevious(hostname, address_family, |
+ host_resolver_flags, addrlist); |
} |
CaptureList GetCaptureList() const { |
@@ -134,6 +137,7 @@ class EchoingHostResolverProc : public HostResolverProc { |
virtual int Resolve(const std::string& hostname, |
AddressFamily address_family, |
+ HostResolverFlags host_resolver_flags, |
AddressList* addrlist) { |
// Encode the request's hostname and address_family in the output address. |
std::string ip_literal = StringPrintf("192.%d.%d.%d", |
@@ -143,6 +147,7 @@ class EchoingHostResolverProc : public HostResolverProc { |
return SystemHostResolverProc(ip_literal, |
ADDRESS_FAMILY_UNSPECIFIED, |
+ host_resolver_flags, |
addrlist); |
} |
}; |
@@ -1491,6 +1496,8 @@ TEST_F(HostResolverImplTest, SetDefaultAddressFamily_Synchronous) { |
EXPECT_EQ("192.1.98.1", NetAddressToString(addrlist[3].head())); |
} |
+// TODO(cbentzel): Test a mix of requests with different HostResolverFlags. |
+ |
} // namespace |
} // namespace net |