diff options
author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-08 14:32:37 +0000 |
---|---|---|
committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-08 14:32:37 +0000 |
commit | 2db58053f8e04deaf129724bdf8ec0b326fb65ac (patch) | |
tree | a4bddfa6d1b53f6b314fe7917954875b1a348200 /chrome/browser/io_thread.h | |
parent | 15d2d47109de2bdfdece9cdb1956b3e8ab73c475 (diff) | |
download | chromium_src-2db58053f8e04deaf129724bdf8ec0b326fb65ac.zip chromium_src-2db58053f8e04deaf129724bdf8ec0b326fb65ac.tar.gz chromium_src-2db58053f8e04deaf129724bdf8ec0b326fb65ac.tar.bz2 |
Revert revert "net: plumb DnsRRResolver from IOThread to HttpNetworkSession."
Landed in r61789, reverted in r61801 in case it was causing Vista Tests
(dbg)(1) to crash. Turns out that it wasn't, so this is the reland.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61954 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/io_thread.h')
-rw-r--r-- | chrome/browser/io_thread.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h index a51d515..9485e0b 100644 --- a/chrome/browser/io_thread.h +++ b/chrome/browser/io_thread.h @@ -24,6 +24,7 @@ class Predictor; } // namespace chrome_browser_net namespace net { +class DnsRRResolver; class HttpAuthHandlerFactory; class URLSecurityManager; } // namespace net @@ -33,6 +34,7 @@ class IOThread : public BrowserProcessSubThread { struct Globals { scoped_ptr<ChromeNetLog> net_log; scoped_ptr<net::HostResolver> host_resolver; + scoped_ptr<net::DnsRRResolver> dnsrr_resolver; scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory; scoped_ptr<net::URLSecurityManager> url_security_manager; ChromeNetworkDelegate network_delegate; |