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

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

Issue 7346024: Get rid of the ProfileId. It was added for ceee. I reverted the original change, since it led to ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 // Assuming NetworkChangeNotifier dispatches in FIFO order, we should be 456 // Assuming NetworkChangeNotifier dispatches in FIFO order, we should be
457 // logging the network change before other IO thread consumers respond to it. 457 // logging the network change before other IO thread consumers respond to it.
458 network_change_observer_.reset( 458 network_change_observer_.reset(
459 new LoggingNetworkChangeObserver(net_log_)); 459 new LoggingNetworkChangeObserver(net_log_));
460 460
461 globals_->extension_event_router_forwarder = 461 globals_->extension_event_router_forwarder =
462 extension_event_router_forwarder_; 462 extension_event_router_forwarder_;
463 globals_->system_network_delegate.reset(new ChromeNetworkDelegate( 463 globals_->system_network_delegate.reset(new ChromeNetworkDelegate(
464 extension_event_router_forwarder_, 464 extension_event_router_forwarder_,
465 NULL, 465 NULL,
466 Profile::kInvalidProfileId, 466 NULL,
467 &system_enable_referrers_)); 467 &system_enable_referrers_));
468 globals_->host_resolver.reset( 468 globals_->host_resolver.reset(
469 CreateGlobalHostResolver(net_log_)); 469 CreateGlobalHostResolver(net_log_));
470 globals_->cert_verifier.reset(new net::CertVerifier); 470 globals_->cert_verifier.reset(new net::CertVerifier);
471 globals_->dnsrr_resolver.reset(new net::DnsRRResolver); 471 globals_->dnsrr_resolver.reset(new net::DnsRRResolver);
472 globals_->ssl_config_service = GetSSLConfigService(); 472 globals_->ssl_config_service = GetSSLConfigService();
473 globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory( 473 globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory(
474 globals_->host_resolver.get())); 474 globals_->host_resolver.get()));
475 // For the ProxyScriptFetcher, we use a direct ProxyService. 475 // For the ProxyScriptFetcher, we use a direct ProxyService.
476 globals_->proxy_script_fetcher_proxy_service.reset( 476 globals_->proxy_script_fetcher_proxy_service.reset(
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 system_params.network_delegate = globals_->system_network_delegate.get(); 708 system_params.network_delegate = globals_->system_network_delegate.get();
709 system_params.net_log = net_log_; 709 system_params.net_log = net_log_;
710 globals_->system_http_transaction_factory.reset( 710 globals_->system_http_transaction_factory.reset(
711 new net::HttpNetworkLayer( 711 new net::HttpNetworkLayer(
712 new net::HttpNetworkSession(system_params))); 712 new net::HttpNetworkSession(system_params)));
713 globals_->system_ftp_transaction_factory.reset( 713 globals_->system_ftp_transaction_factory.reset(
714 new net::FtpNetworkLayer(globals_->host_resolver.get())); 714 new net::FtpNetworkLayer(globals_->host_resolver.get()));
715 globals_->system_request_context = 715 globals_->system_request_context =
716 ConstructSystemRequestContext(globals_, net_log_); 716 ConstructSystemRequestContext(globals_, net_log_);
717 } 717 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_webrequest_api_unittest.cc ('k') | chrome/browser/net/chrome_network_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698