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 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
473 network_change_observer_.reset( | 473 network_change_observer_.reset( |
474 new LoggingNetworkChangeObserver(net_log_)); | 474 new LoggingNetworkChangeObserver(net_log_)); |
475 | 475 |
476 // Setup the HistogramWatcher to run on the IO thread. | 476 // Setup the HistogramWatcher to run on the IO thread. |
477 net::NetworkChangeNotifier::InitHistogramWatcher(); | 477 net::NetworkChangeNotifier::InitHistogramWatcher(); |
478 | 478 |
479 globals_->extension_event_router_forwarder = | 479 globals_->extension_event_router_forwarder = |
480 extension_event_router_forwarder_; | 480 extension_event_router_forwarder_; |
481 ChromeNetworkDelegate* network_delegate = | 481 ChromeNetworkDelegate* network_delegate = |
482 new ChromeNetworkDelegate(extension_event_router_forwarder_, | 482 new ChromeNetworkDelegate(extension_event_router_forwarder_, |
483 &system_enable_referrers_); | 483 &system_enable_referrers_, |
| 484 command_line.HasSwitch( |
| 485 switches::kEnableClientHints)); |
484 if (command_line.HasSwitch(switches::kDisableExtensionsHttpThrottling)) | 486 if (command_line.HasSwitch(switches::kDisableExtensionsHttpThrottling)) |
485 network_delegate->NeverThrottleRequests(); | 487 network_delegate->NeverThrottleRequests(); |
486 globals_->system_network_delegate.reset(network_delegate); | 488 globals_->system_network_delegate.reset(network_delegate); |
487 globals_->host_resolver = CreateGlobalHostResolver(net_log_); | 489 globals_->host_resolver = CreateGlobalHostResolver(net_log_); |
488 UpdateDnsClientEnabled(); | 490 UpdateDnsClientEnabled(); |
489 globals_->cert_verifier.reset(net::CertVerifier::CreateDefault()); | 491 globals_->cert_verifier.reset(net::CertVerifier::CreateDefault()); |
490 globals_->transport_security_state.reset(new net::TransportSecurityState()); | 492 globals_->transport_security_state.reset(new net::TransportSecurityState()); |
491 globals_->ssl_config_service = GetSSLConfigService(); | 493 globals_->ssl_config_service = GetSSLConfigService(); |
492 if (command_line.HasSwitch(switches::kSpdyProxyOrigin)) { | 494 if (command_line.HasSwitch(switches::kSpdyProxyOrigin)) { |
493 spdyproxy_origin_ = | 495 spdyproxy_origin_ = |
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
912 globals_->system_request_context.reset( | 914 globals_->system_request_context.reset( |
913 ConstructSystemRequestContext(globals_, net_log_)); | 915 ConstructSystemRequestContext(globals_, net_log_)); |
914 | 916 |
915 sdch_manager_->set_sdch_fetcher( | 917 sdch_manager_->set_sdch_fetcher( |
916 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); | 918 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); |
917 } | 919 } |
918 | 920 |
919 void IOThread::UpdateDnsClientEnabled() { | 921 void IOThread::UpdateDnsClientEnabled() { |
920 globals()->host_resolver->SetDnsClientEnabled(*dns_client_enabled_); | 922 globals()->host_resolver->SetDnsClientEnabled(*dns_client_enabled_); |
921 } | 923 } |
OLD | NEW |