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 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
360 prefs::kEnableAuthNegotiatePort); | 360 prefs::kEnableAuthNegotiatePort); |
361 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist); | 361 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist); |
362 auth_delegate_whitelist_ = local_state->GetString( | 362 auth_delegate_whitelist_ = local_state->GetString( |
363 prefs::kAuthNegotiateDelegateWhitelist); | 363 prefs::kAuthNegotiateDelegateWhitelist); |
364 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); | 364 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); |
365 pref_proxy_config_tracker_.reset( | 365 pref_proxy_config_tracker_.reset( |
366 ProxyServiceFactory::CreatePrefProxyConfigTracker(local_state)); | 366 ProxyServiceFactory::CreatePrefProxyConfigTracker(local_state)); |
367 ChromeNetworkDelegate::InitializePrefsOnUIThread( | 367 ChromeNetworkDelegate::InitializePrefsOnUIThread( |
368 &system_enable_referrers_, | 368 &system_enable_referrers_, |
369 NULL, | 369 NULL, |
| 370 NULL, |
370 local_state); | 371 local_state); |
371 ssl_config_service_manager_.reset( | 372 ssl_config_service_manager_.reset( |
372 SSLConfigServiceManager::CreateDefaultManager(local_state, NULL)); | 373 SSLConfigServiceManager::CreateDefaultManager(local_state, NULL)); |
373 | 374 |
374 BrowserThread::SetDelegate(BrowserThread::IO, this); | 375 BrowserThread::SetDelegate(BrowserThread::IO, this); |
375 } | 376 } |
376 | 377 |
377 IOThread::~IOThread() { | 378 IOThread::~IOThread() { |
378 // This isn't needed for production code, but in tests, IOThread may | 379 // This isn't needed for production code, but in tests, IOThread may |
379 // be multiply constructed. | 380 // be multiply constructed. |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
435 extension_event_router_forwarder_; | 436 extension_event_router_forwarder_; |
436 ChromeNetworkDelegate* network_delegate = new ChromeNetworkDelegate( | 437 ChromeNetworkDelegate* network_delegate = new ChromeNetworkDelegate( |
437 extension_event_router_forwarder_, | 438 extension_event_router_forwarder_, |
438 NULL, | 439 NULL, |
439 NULL, | 440 NULL, |
440 NULL, | 441 NULL, |
441 NULL, | 442 NULL, |
442 NULL, | 443 NULL, |
443 &system_enable_referrers_, | 444 &system_enable_referrers_, |
444 NULL, | 445 NULL, |
| 446 NULL, |
445 NULL); | 447 NULL); |
446 if (command_line.HasSwitch(switches::kDisableExtensionsHttpThrottling)) | 448 if (command_line.HasSwitch(switches::kDisableExtensionsHttpThrottling)) |
447 network_delegate->NeverThrottleRequests(); | 449 network_delegate->NeverThrottleRequests(); |
448 globals_->system_network_delegate.reset(network_delegate); | 450 globals_->system_network_delegate.reset(network_delegate); |
449 globals_->host_resolver.reset( | 451 globals_->host_resolver.reset( |
450 CreateGlobalHostResolver(net_log_)); | 452 CreateGlobalHostResolver(net_log_)); |
451 globals_->cert_verifier.reset(net::CertVerifier::CreateDefault()); | 453 globals_->cert_verifier.reset(net::CertVerifier::CreateDefault()); |
452 globals_->transport_security_state.reset(new net::TransportSecurityState()); | 454 globals_->transport_security_state.reset(new net::TransportSecurityState()); |
453 globals_->ssl_config_service = GetSSLConfigService(); | 455 globals_->ssl_config_service = GetSSLConfigService(); |
454 if (command_line.HasSwitch(switches::kSpdyProxyOrigin)) { | 456 if (command_line.HasSwitch(switches::kSpdyProxyOrigin)) { |
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
730 new net::HttpNetworkLayer( | 732 new net::HttpNetworkLayer( |
731 new net::HttpNetworkSession(system_params))); | 733 new net::HttpNetworkSession(system_params))); |
732 globals_->system_ftp_transaction_factory.reset( | 734 globals_->system_ftp_transaction_factory.reset( |
733 new net::FtpNetworkLayer(globals_->host_resolver.get())); | 735 new net::FtpNetworkLayer(globals_->host_resolver.get())); |
734 globals_->system_request_context.reset( | 736 globals_->system_request_context.reset( |
735 ConstructSystemRequestContext(globals_, net_log_)); | 737 ConstructSystemRequestContext(globals_, net_log_)); |
736 | 738 |
737 sdch_manager_->set_sdch_fetcher( | 739 sdch_manager_->set_sdch_fetcher( |
738 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); | 740 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); |
739 } | 741 } |
OLD | NEW |