summaryrefslogtreecommitdiffstats
path: root/chrome/browser/io_thread.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-23 08:31:14 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-23 08:31:14 +0000
commit8202d0cda0660d43f699160179df6c95058ab928 (patch)
tree0025c388d8e833fb1462eb84f94e63d38d1e353b /chrome/browser/io_thread.cc
parent1a3b42b3b153860e59831e71d59cecaf36a2454e (diff)
downloadchromium_src-8202d0cda0660d43f699160179df6c95058ab928.zip
chromium_src-8202d0cda0660d43f699160179df6c95058ab928.tar.gz
chromium_src-8202d0cda0660d43f699160179df6c95058ab928.tar.bz2
Send fatal proxy errors to the network delegate.
BUG=60099 TEST=browser test Review URL: http://codereview.chromium.org/6541021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75726 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/io_thread.cc')
-rw-r--r--chrome/browser/io_thread.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 2a854b8..e966707 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -346,7 +346,8 @@ void IOThread::Init() {
globals_->proxy_script_fetcher_proxy_service.get();
session_params.http_auth_handler_factory =
globals_->http_auth_handler_factory.get();
- session_params.network_delegate = &globals_->network_delegate;
+ // TODO(willchan): Enable for proxy script fetcher context.
+ session_params.network_delegate = NULL;
session_params.net_log = net_log_;
session_params.ssl_config_service = globals_->ssl_config_service;
scoped_refptr<net::HttpNetworkSession> network_session(