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 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
367 prefs::kEnableAuthNegotiatePort); | 367 prefs::kEnableAuthNegotiatePort); |
368 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist); | 368 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist); |
369 auth_delegate_whitelist_ = local_state->GetString( | 369 auth_delegate_whitelist_ = local_state->GetString( |
370 prefs::kAuthNegotiateDelegateWhitelist); | 370 prefs::kAuthNegotiateDelegateWhitelist); |
371 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); | 371 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); |
372 pref_proxy_config_tracker_.reset( | 372 pref_proxy_config_tracker_.reset( |
373 ProxyServiceFactory::CreatePrefProxyConfigTracker(local_state)); | 373 ProxyServiceFactory::CreatePrefProxyConfigTracker(local_state)); |
374 ChromeNetworkDelegate::InitializePrefsOnUIThread( | 374 ChromeNetworkDelegate::InitializePrefsOnUIThread( |
375 &system_enable_referrers_, | 375 &system_enable_referrers_, |
376 NULL, | 376 NULL, |
| 377 NULL, |
377 local_state); | 378 local_state); |
378 ssl_config_service_manager_.reset( | 379 ssl_config_service_manager_.reset( |
379 SSLConfigServiceManager::CreateDefaultManager(local_state, NULL)); | 380 SSLConfigServiceManager::CreateDefaultManager(local_state, NULL)); |
380 | 381 |
381 BrowserThread::SetDelegate(BrowserThread::IO, this); | 382 BrowserThread::SetDelegate(BrowserThread::IO, this); |
382 } | 383 } |
383 | 384 |
384 IOThread::~IOThread() { | 385 IOThread::~IOThread() { |
385 // This isn't needed for production code, but in tests, IOThread may | 386 // This isn't needed for production code, but in tests, IOThread may |
386 // be multiply constructed. | 387 // be multiply constructed. |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
442 extension_event_router_forwarder_; | 443 extension_event_router_forwarder_; |
443 ChromeNetworkDelegate* network_delegate = new ChromeNetworkDelegate( | 444 ChromeNetworkDelegate* network_delegate = new ChromeNetworkDelegate( |
444 extension_event_router_forwarder_, | 445 extension_event_router_forwarder_, |
445 NULL, | 446 NULL, |
446 NULL, | 447 NULL, |
447 NULL, | 448 NULL, |
448 NULL, | 449 NULL, |
449 NULL, | 450 NULL, |
450 &system_enable_referrers_, | 451 &system_enable_referrers_, |
451 NULL, | 452 NULL, |
| 453 NULL, |
452 NULL); | 454 NULL); |
453 if (command_line.HasSwitch(switches::kDisableExtensionsHttpThrottling)) | 455 if (command_line.HasSwitch(switches::kDisableExtensionsHttpThrottling)) |
454 network_delegate->NeverThrottleRequests(); | 456 network_delegate->NeverThrottleRequests(); |
455 globals_->system_network_delegate.reset(network_delegate); | 457 globals_->system_network_delegate.reset(network_delegate); |
456 globals_->host_resolver = CreateGlobalHostResolver(net_log_); | 458 globals_->host_resolver = CreateGlobalHostResolver(net_log_); |
457 globals_->cert_verifier.reset(net::CertVerifier::CreateDefault()); | 459 globals_->cert_verifier.reset(net::CertVerifier::CreateDefault()); |
458 globals_->transport_security_state.reset(new net::TransportSecurityState()); | 460 globals_->transport_security_state.reset(new net::TransportSecurityState()); |
459 globals_->ssl_config_service = GetSSLConfigService(); | 461 globals_->ssl_config_service = GetSSLConfigService(); |
460 if (command_line.HasSwitch(switches::kSpdyProxyOrigin)) { | 462 if (command_line.HasSwitch(switches::kSpdyProxyOrigin)) { |
461 spdyproxy_origin_ = | 463 spdyproxy_origin_ = |
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
738 new net::HttpNetworkLayer( | 740 new net::HttpNetworkLayer( |
739 new net::HttpNetworkSession(system_params))); | 741 new net::HttpNetworkSession(system_params))); |
740 globals_->system_ftp_transaction_factory.reset( | 742 globals_->system_ftp_transaction_factory.reset( |
741 new net::FtpNetworkLayer(globals_->host_resolver.get())); | 743 new net::FtpNetworkLayer(globals_->host_resolver.get())); |
742 globals_->system_request_context.reset( | 744 globals_->system_request_context.reset( |
743 ConstructSystemRequestContext(globals_, net_log_)); | 745 ConstructSystemRequestContext(globals_, net_log_)); |
744 | 746 |
745 sdch_manager_->set_sdch_fetcher( | 747 sdch_manager_->set_sdch_fetcher( |
746 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); | 748 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); |
747 } | 749 } |
OLD | NEW |