| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 395 new LoggingNetworkChangeObserver(net_log_)); | 395 new LoggingNetworkChangeObserver(net_log_)); |
| 396 | 396 |
| 397 globals_->extension_event_router_forwarder = | 397 globals_->extension_event_router_forwarder = |
| 398 extension_event_router_forwarder_; | 398 extension_event_router_forwarder_; |
| 399 ChromeNetworkDelegate* network_delegate = new ChromeNetworkDelegate( | 399 ChromeNetworkDelegate* network_delegate = new ChromeNetworkDelegate( |
| 400 extension_event_router_forwarder_, | 400 extension_event_router_forwarder_, |
| 401 NULL, | 401 NULL, |
| 402 NULL, | 402 NULL, |
| 403 NULL, | 403 NULL, |
| 404 NULL, | 404 NULL, |
| 405 NULL, |
| 405 &system_enable_referrers_); | 406 &system_enable_referrers_); |
| 406 if (CommandLine::ForCurrentProcess()->HasSwitch( | 407 if (CommandLine::ForCurrentProcess()->HasSwitch( |
| 407 switches::kDisableExtensionsHttpThrottling)) { | 408 switches::kDisableExtensionsHttpThrottling)) { |
| 408 network_delegate->NeverThrottleRequests(); | 409 network_delegate->NeverThrottleRequests(); |
| 409 } | 410 } |
| 410 globals_->system_network_delegate.reset(network_delegate); | 411 globals_->system_network_delegate.reset(network_delegate); |
| 411 globals_->host_resolver.reset( | 412 globals_->host_resolver.reset( |
| 412 CreateGlobalHostResolver(net_log_)); | 413 CreateGlobalHostResolver(net_log_)); |
| 413 globals_->cert_verifier.reset(net::CertVerifier::CreateDefault()); | 414 globals_->cert_verifier.reset(net::CertVerifier::CreateDefault()); |
| 414 globals_->transport_security_state.reset(new net::TransportSecurityState()); | 415 globals_->transport_security_state.reset(new net::TransportSecurityState()); |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 624 new net::HttpNetworkLayer( | 625 new net::HttpNetworkLayer( |
| 625 new net::HttpNetworkSession(system_params))); | 626 new net::HttpNetworkSession(system_params))); |
| 626 globals_->system_ftp_transaction_factory.reset( | 627 globals_->system_ftp_transaction_factory.reset( |
| 627 new net::FtpNetworkLayer(globals_->host_resolver.get())); | 628 new net::FtpNetworkLayer(globals_->host_resolver.get())); |
| 628 globals_->system_request_context.reset( | 629 globals_->system_request_context.reset( |
| 629 ConstructSystemRequestContext(globals_, net_log_)); | 630 ConstructSystemRequestContext(globals_, net_log_)); |
| 630 | 631 |
| 631 sdch_manager_->set_sdch_fetcher( | 632 sdch_manager_->set_sdch_fetcher( |
| 632 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); | 633 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); |
| 633 } | 634 } |
| OLD | NEW |