Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(658)

Side by Side Diff: chrome/browser/io_thread.cc

Issue 6541021: Send fatal proxy errors to the network delegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/io_thread.h" 5 #include "chrome/browser/io_thread.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/leak_tracker.h" 10 #include "base/debug/leak_tracker.h"
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 // For the ProxyScriptFetcher, we use a direct ProxyService. 339 // For the ProxyScriptFetcher, we use a direct ProxyService.
340 globals_->proxy_script_fetcher_proxy_service = 340 globals_->proxy_script_fetcher_proxy_service =
341 net::ProxyService::CreateDirectWithNetLog(net_log_); 341 net::ProxyService::CreateDirectWithNetLog(net_log_);
342 net::HttpNetworkSession::Params session_params; 342 net::HttpNetworkSession::Params session_params;
343 session_params.host_resolver = globals_->host_resolver.get(); 343 session_params.host_resolver = globals_->host_resolver.get();
344 session_params.cert_verifier = globals_->cert_verifier.get(); 344 session_params.cert_verifier = globals_->cert_verifier.get();
345 session_params.proxy_service = 345 session_params.proxy_service =
346 globals_->proxy_script_fetcher_proxy_service.get(); 346 globals_->proxy_script_fetcher_proxy_service.get();
347 session_params.http_auth_handler_factory = 347 session_params.http_auth_handler_factory =
348 globals_->http_auth_handler_factory.get(); 348 globals_->http_auth_handler_factory.get();
349 session_params.network_delegate = &globals_->network_delegate; 349 // TODO(willchan): Enable for proxy script fetcher context.
willchan no longer on Chromium 2011/02/21 23:35:39 What happened here? How does it break?
350 session_params.network_delegate = NULL;
350 session_params.net_log = net_log_; 351 session_params.net_log = net_log_;
351 session_params.ssl_config_service = globals_->ssl_config_service; 352 session_params.ssl_config_service = globals_->ssl_config_service;
352 scoped_refptr<net::HttpNetworkSession> network_session( 353 scoped_refptr<net::HttpNetworkSession> network_session(
353 new net::HttpNetworkSession(session_params)); 354 new net::HttpNetworkSession(session_params));
354 globals_->proxy_script_fetcher_http_transaction_factory.reset( 355 globals_->proxy_script_fetcher_http_transaction_factory.reset(
355 new net::HttpNetworkLayer(network_session)); 356 new net::HttpNetworkLayer(network_session));
356 357
357 scoped_refptr<net::URLRequestContext> proxy_script_fetcher_context = 358 scoped_refptr<net::URLRequestContext> proxy_script_fetcher_context =
358 ConstructProxyScriptFetcherContext(globals_, net_log_); 359 ConstructProxyScriptFetcherContext(globals_, net_log_);
359 globals_->proxy_script_fetcher_context = proxy_script_fetcher_context; 360 globals_->proxy_script_fetcher_context = proxy_script_fetcher_context;
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 void IOThread::ClearHostCache() { 524 void IOThread::ClearHostCache() {
524 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 525 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
525 526
526 if (globals_->host_resolver->GetAsHostResolverImpl()) { 527 if (globals_->host_resolver->GetAsHostResolverImpl()) {
527 net::HostCache* host_cache = 528 net::HostCache* host_cache =
528 globals_->host_resolver.get()->GetAsHostResolverImpl()->cache(); 529 globals_->host_resolver.get()->GetAsHostResolverImpl()->cache();
529 if (host_cache) 530 if (host_cache)
530 host_cache->clear(); 531 host_cache->clear();
531 } 532 }
532 } 533 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698