summaryrefslogtreecommitdiffstats
path: root/net/dns/dns_session.h
diff options
context:
space:
mode:
authorszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-21 21:23:20 +0000
committerszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-21 21:23:20 +0000
commitb3601bc27df66f4e58086defc5788fc6365e4601 (patch)
tree1a938a765e1386e784ff726c580cfa93502727c4 /net/dns/dns_session.h
parentad48b7fbd53d9180b5b917dbf9142b7bd6fa6fa6 (diff)
downloadchromium_src-b3601bc27df66f4e58086defc5788fc6365e4601.zip
chromium_src-b3601bc27df66f4e58086defc5788fc6365e4601.tar.gz
chromium_src-b3601bc27df66f4e58086defc5788fc6365e4601.tar.bz2
[net] Asynchronous DNS ready for experiments.
If started with --enable-async-dns, HostResolverImpl will use DnsConfigService to determine system DNS configuration and DnsTransaction to resolve host names. It will fallback to HostResolverProc on failure. BUG=90881, 107880, 113829 TEST=./net_unittests --gtest_filter=HostResolverImpl*:Dns* Review URL: http://codereview.chromium.org/9369045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/dns/dns_session.h')
-rw-r--r--net/dns/dns_session.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dns/dns_session.h b/net/dns/dns_session.h
index 85aea0a..aa070ac 100644
--- a/net/dns/dns_session.h
+++ b/net/dns/dns_session.h
@@ -34,7 +34,7 @@ class NET_EXPORT_PRIVATE DnsSession
const DnsConfig& config() const { return config_; }
NetLog* net_log() const { return net_log_; }
- ClientSocketFactory* socket_factory() { return socket_factory_.get(); }
+ ClientSocketFactory* socket_factory() { return socket_factory_; }
// Return the next random query ID.
int NextQueryId() const;
@@ -50,7 +50,7 @@ class NET_EXPORT_PRIVATE DnsSession
~DnsSession();
const DnsConfig config_;
- scoped_ptr<ClientSocketFactory> socket_factory_;
+ ClientSocketFactory* socket_factory_;
RandCallback rand_callback_;
NetLog* net_log_;