Index: net/dns/async_host_resolver.h |
diff --git a/net/dns/async_host_resolver.h b/net/dns/async_host_resolver.h |
index e8aeb8b90583685dd1a86bb9fb87c4d58d2f63ec..fd19081fb727c1f0d07497a8ad03ab4e264db7e0 100644 |
--- a/net/dns/async_host_resolver.h |
+++ b/net/dns/async_host_resolver.h |
@@ -28,7 +28,7 @@ class NET_EXPORT AsyncHostResolver |
AsyncHostResolver(size_t max_dns_requests, |
size_t max_pending_requests, |
HostCache* cache, |
- DnsClient* client, |
+ scoped_ptr<DnsClient> client, |
NetLog* net_log); |
virtual ~AsyncHostResolver(); |
@@ -46,9 +46,9 @@ class NET_EXPORT AsyncHostResolver |
virtual AddressFamily GetDefaultAddressFamily() const OVERRIDE; |
virtual HostCache* GetHostCache() OVERRIDE; |
- void OnDnsRequestComplete(DnsClient::Request* request, |
- int result, |
- const DnsResponse* transaction); |
+ void OnDnsTransactionComplete(DnsTransaction* transaction, |
+ int result, |
+ const DnsResponse* response); |
private: |
FRIEND_TEST_ALL_PREFIXES(AsyncHostResolverTest, QueuedLookup); |
@@ -64,7 +64,7 @@ class NET_EXPORT AsyncHostResolver |
typedef std::pair<std::string, uint16> Key; |
typedef std::list<Request*> RequestList; |
- typedef std::list<const DnsClient::Request*> DnsRequestList; |
+ typedef std::list<const DnsTransaction*> DnsRequestList; |
cbentzel
2012/01/13 13:39:54
DnsTransactionList?
mmenke
2012/01/13 16:44:37
nit: DnsTransactionList
|
typedef std::map<Key, RequestList> KeyRequestListMap; |
// Create a new request for the incoming Resolve() call. |
@@ -126,7 +126,7 @@ class NET_EXPORT AsyncHostResolver |
// Cache of host resolution results. |
scoped_ptr<HostCache> cache_; |
- DnsClient* client_; |
+ scoped_ptr<DnsClient> client_; |
NetLog* net_log_; |