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

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

Issue 7827033: Introduce net::HttpServerPropertiesManager to manage server-specific properties. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 globals->http_auth_handler_factory.get()); 253 globals->http_auth_handler_factory.get());
254 context->set_proxy_service(globals->proxy_script_fetcher_proxy_service.get()); 254 context->set_proxy_service(globals->proxy_script_fetcher_proxy_service.get());
255 context->set_http_transaction_factory( 255 context->set_http_transaction_factory(
256 globals->proxy_script_fetcher_http_transaction_factory.get()); 256 globals->proxy_script_fetcher_http_transaction_factory.get());
257 context->set_ftp_transaction_factory( 257 context->set_ftp_transaction_factory(
258 globals->proxy_script_fetcher_ftp_transaction_factory.get()); 258 globals->proxy_script_fetcher_ftp_transaction_factory.get());
259 context->set_cookie_store(globals->system_cookie_store.get()); 259 context->set_cookie_store(globals->system_cookie_store.get());
260 context->set_origin_bound_cert_service( 260 context->set_origin_bound_cert_service(
261 globals->system_origin_bound_cert_service.get()); 261 globals->system_origin_bound_cert_service.get());
262 context->set_network_delegate(globals->system_network_delegate.get()); 262 context->set_network_delegate(globals->system_network_delegate.get());
263 context->set_http_server_properties(NULL);
willchan no longer on Chromium 2011/10/06 22:13:22 I don't see why this is necessary, doesn't URLRequ
ramant (doing other things) 2011/10/07 01:40:20 Done.
263 return context; 264 return context;
264 } 265 }
265 266
266 scoped_refptr<net::URLRequestContext> 267 scoped_refptr<net::URLRequestContext>
267 ConstructSystemRequestContext(IOThread::Globals* globals, 268 ConstructSystemRequestContext(IOThread::Globals* globals,
268 net::NetLog* net_log) { 269 net::NetLog* net_log) {
269 scoped_refptr<net::URLRequestContext> context( 270 scoped_refptr<net::URLRequestContext> context(
270 new SystemURLRequestContext); 271 new SystemURLRequestContext);
271 context->set_net_log(net_log); 272 context->set_net_log(net_log);
272 context->set_host_resolver(globals->host_resolver.get()); 273 context->set_host_resolver(globals->host_resolver.get());
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 net::HttpNetworkSession::Params session_params; 447 net::HttpNetworkSession::Params session_params;
447 session_params.host_resolver = globals_->host_resolver.get(); 448 session_params.host_resolver = globals_->host_resolver.get();
448 session_params.cert_verifier = globals_->cert_verifier.get(); 449 session_params.cert_verifier = globals_->cert_verifier.get();
449 session_params.origin_bound_cert_service = 450 session_params.origin_bound_cert_service =
450 globals_->system_origin_bound_cert_service.get(); 451 globals_->system_origin_bound_cert_service.get();
451 session_params.proxy_service = 452 session_params.proxy_service =
452 globals_->proxy_script_fetcher_proxy_service.get(); 453 globals_->proxy_script_fetcher_proxy_service.get();
453 session_params.http_auth_handler_factory = 454 session_params.http_auth_handler_factory =
454 globals_->http_auth_handler_factory.get(); 455 globals_->http_auth_handler_factory.get();
455 session_params.network_delegate = globals_->system_network_delegate.get(); 456 session_params.network_delegate = globals_->system_network_delegate.get();
457 session_params.http_server_properties = NULL;
456 session_params.net_log = net_log_; 458 session_params.net_log = net_log_;
457 session_params.ssl_config_service = globals_->ssl_config_service; 459 session_params.ssl_config_service = globals_->ssl_config_service;
458 scoped_refptr<net::HttpNetworkSession> network_session( 460 scoped_refptr<net::HttpNetworkSession> network_session(
459 new net::HttpNetworkSession(session_params)); 461 new net::HttpNetworkSession(session_params));
460 globals_->proxy_script_fetcher_http_transaction_factory.reset( 462 globals_->proxy_script_fetcher_http_transaction_factory.reset(
461 new net::HttpNetworkLayer(network_session)); 463 new net::HttpNetworkLayer(network_session));
462 globals_->proxy_script_fetcher_ftp_transaction_factory.reset( 464 globals_->proxy_script_fetcher_ftp_transaction_factory.reset(
463 new net::FtpNetworkLayer(globals_->host_resolver.get())); 465 new net::FtpNetworkLayer(globals_->host_resolver.get()));
464 466
465 globals_->proxy_script_fetcher_context = 467 globals_->proxy_script_fetcher_context =
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 system_params.origin_bound_cert_service = 607 system_params.origin_bound_cert_service =
606 globals_->system_origin_bound_cert_service.get(); 608 globals_->system_origin_bound_cert_service.get();
607 system_params.dnsrr_resolver = globals_->dnsrr_resolver.get(); 609 system_params.dnsrr_resolver = globals_->dnsrr_resolver.get();
608 system_params.dns_cert_checker = NULL; 610 system_params.dns_cert_checker = NULL;
609 system_params.ssl_host_info_factory = NULL; 611 system_params.ssl_host_info_factory = NULL;
610 system_params.proxy_service = globals_->system_proxy_service.get(); 612 system_params.proxy_service = globals_->system_proxy_service.get();
611 system_params.ssl_config_service = globals_->ssl_config_service.get(); 613 system_params.ssl_config_service = globals_->ssl_config_service.get();
612 system_params.http_auth_handler_factory = 614 system_params.http_auth_handler_factory =
613 globals_->http_auth_handler_factory.get(); 615 globals_->http_auth_handler_factory.get();
614 system_params.network_delegate = globals_->system_network_delegate.get(); 616 system_params.network_delegate = globals_->system_network_delegate.get();
617 system_params.http_server_properties = NULL;
615 system_params.net_log = net_log_; 618 system_params.net_log = net_log_;
616 globals_->system_http_transaction_factory.reset( 619 globals_->system_http_transaction_factory.reset(
617 new net::HttpNetworkLayer( 620 new net::HttpNetworkLayer(
618 new net::HttpNetworkSession(system_params))); 621 new net::HttpNetworkSession(system_params)));
619 globals_->system_ftp_transaction_factory.reset( 622 globals_->system_ftp_transaction_factory.reset(
620 new net::FtpNetworkLayer(globals_->host_resolver.get())); 623 new net::FtpNetworkLayer(globals_->host_resolver.get()));
621 globals_->system_request_context = 624 globals_->system_request_context =
622 ConstructSystemRequestContext(globals_, net_log_); 625 ConstructSystemRequestContext(globals_, net_log_);
623 } 626 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698