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 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
351 prefs::kEnableAuthNegotiatePort); | 351 prefs::kEnableAuthNegotiatePort); |
352 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist); | 352 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist); |
353 auth_delegate_whitelist_ = local_state->GetString( | 353 auth_delegate_whitelist_ = local_state->GetString( |
354 prefs::kAuthNegotiateDelegateWhitelist); | 354 prefs::kAuthNegotiateDelegateWhitelist); |
355 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); | 355 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); |
356 pref_proxy_config_tracker_.reset( | 356 pref_proxy_config_tracker_.reset( |
357 ProxyServiceFactory::CreatePrefProxyConfigTracker(local_state)); | 357 ProxyServiceFactory::CreatePrefProxyConfigTracker(local_state)); |
358 ChromeNetworkDelegate::InitializePrefsOnUIThread( | 358 ChromeNetworkDelegate::InitializePrefsOnUIThread( |
359 &system_enable_referrers_, | 359 &system_enable_referrers_, |
360 NULL, | 360 NULL, |
| 361 NULL, |
361 local_state); | 362 local_state); |
362 ssl_config_service_manager_.reset( | 363 ssl_config_service_manager_.reset( |
363 SSLConfigServiceManager::CreateDefaultManager(local_state, NULL)); | 364 SSLConfigServiceManager::CreateDefaultManager(local_state, NULL)); |
364 | 365 |
365 BrowserThread::SetDelegate(BrowserThread::IO, this); | 366 BrowserThread::SetDelegate(BrowserThread::IO, this); |
366 } | 367 } |
367 | 368 |
368 IOThread::~IOThread() { | 369 IOThread::~IOThread() { |
369 // This isn't needed for production code, but in tests, IOThread may | 370 // This isn't needed for production code, but in tests, IOThread may |
370 // be multiply constructed. | 371 // be multiply constructed. |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
426 extension_event_router_forwarder_; | 427 extension_event_router_forwarder_; |
427 ChromeNetworkDelegate* network_delegate = new ChromeNetworkDelegate( | 428 ChromeNetworkDelegate* network_delegate = new ChromeNetworkDelegate( |
428 extension_event_router_forwarder_, | 429 extension_event_router_forwarder_, |
429 NULL, | 430 NULL, |
430 NULL, | 431 NULL, |
431 NULL, | 432 NULL, |
432 NULL, | 433 NULL, |
433 NULL, | 434 NULL, |
434 &system_enable_referrers_, | 435 &system_enable_referrers_, |
435 NULL, | 436 NULL, |
| 437 NULL, |
436 NULL); | 438 NULL); |
437 if (command_line.HasSwitch(switches::kDisableExtensionsHttpThrottling)) | 439 if (command_line.HasSwitch(switches::kDisableExtensionsHttpThrottling)) |
438 network_delegate->NeverThrottleRequests(); | 440 network_delegate->NeverThrottleRequests(); |
439 globals_->system_network_delegate.reset(network_delegate); | 441 globals_->system_network_delegate.reset(network_delegate); |
440 globals_->host_resolver = CreateGlobalHostResolver(net_log_); | 442 globals_->host_resolver = CreateGlobalHostResolver(net_log_); |
441 globals_->cert_verifier.reset(net::CertVerifier::CreateDefault()); | 443 globals_->cert_verifier.reset(net::CertVerifier::CreateDefault()); |
442 globals_->transport_security_state.reset(new net::TransportSecurityState()); | 444 globals_->transport_security_state.reset(new net::TransportSecurityState()); |
443 globals_->ssl_config_service = GetSSLConfigService(); | 445 globals_->ssl_config_service = GetSSLConfigService(); |
444 if (command_line.HasSwitch(switches::kSpdyProxyOrigin)) { | 446 if (command_line.HasSwitch(switches::kSpdyProxyOrigin)) { |
445 spdyproxy_origin_ = | 447 spdyproxy_origin_ = |
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
720 new net::HttpNetworkLayer( | 722 new net::HttpNetworkLayer( |
721 new net::HttpNetworkSession(system_params))); | 723 new net::HttpNetworkSession(system_params))); |
722 globals_->system_ftp_transaction_factory.reset( | 724 globals_->system_ftp_transaction_factory.reset( |
723 new net::FtpNetworkLayer(globals_->host_resolver.get())); | 725 new net::FtpNetworkLayer(globals_->host_resolver.get())); |
724 globals_->system_request_context.reset( | 726 globals_->system_request_context.reset( |
725 ConstructSystemRequestContext(globals_, net_log_)); | 727 ConstructSystemRequestContext(globals_, net_log_)); |
726 | 728 |
727 sdch_manager_->set_sdch_fetcher( | 729 sdch_manager_->set_sdch_fetcher( |
728 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); | 730 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); |
729 } | 731 } |
OLD | NEW |