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 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
349 negotiate_disable_cname_lookup_ = local_state->GetBoolean( | 349 negotiate_disable_cname_lookup_ = local_state->GetBoolean( |
350 prefs::kDisableAuthNegotiateCnameLookup); | 350 prefs::kDisableAuthNegotiateCnameLookup); |
351 negotiate_enable_port_ = local_state->GetBoolean( | 351 negotiate_enable_port_ = local_state->GetBoolean( |
352 prefs::kEnableAuthNegotiatePort); | 352 prefs::kEnableAuthNegotiatePort); |
353 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist); | 353 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist); |
354 auth_delegate_whitelist_ = local_state->GetString( | 354 auth_delegate_whitelist_ = local_state->GetString( |
355 prefs::kAuthNegotiateDelegateWhitelist); | 355 prefs::kAuthNegotiateDelegateWhitelist); |
356 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); | 356 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); |
357 pref_proxy_config_tracker_.reset( | 357 pref_proxy_config_tracker_.reset( |
358 ProxyServiceFactory::CreatePrefProxyConfigTracker(local_state)); | 358 ProxyServiceFactory::CreatePrefProxyConfigTracker(local_state)); |
359 ChromeNetworkDelegate::InitializeReferrersEnabled(&system_enable_referrers_, | 359 ChromeNetworkDelegate::InitializePrefsOnUIThread( |
360 local_state); | 360 &system_enable_referrers_, |
| 361 NULL, |
| 362 local_state); |
361 ssl_config_service_manager_.reset( | 363 ssl_config_service_manager_.reset( |
362 SSLConfigServiceManager::CreateDefaultManager(local_state, NULL)); | 364 SSLConfigServiceManager::CreateDefaultManager(local_state, NULL)); |
363 | 365 |
364 BrowserThread::SetDelegate(BrowserThread::IO, this); | 366 BrowserThread::SetDelegate(BrowserThread::IO, this); |
365 } | 367 } |
366 | 368 |
367 IOThread::~IOThread() { | 369 IOThread::~IOThread() { |
368 // 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 |
369 // be multiply constructed. | 371 // be multiply constructed. |
370 BrowserThread::SetDelegate(BrowserThread::IO, NULL); | 372 BrowserThread::SetDelegate(BrowserThread::IO, NULL); |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
424 globals_->extension_event_router_forwarder = | 426 globals_->extension_event_router_forwarder = |
425 extension_event_router_forwarder_; | 427 extension_event_router_forwarder_; |
426 ChromeNetworkDelegate* network_delegate = new ChromeNetworkDelegate( | 428 ChromeNetworkDelegate* network_delegate = new ChromeNetworkDelegate( |
427 extension_event_router_forwarder_, | 429 extension_event_router_forwarder_, |
428 NULL, | 430 NULL, |
429 NULL, | 431 NULL, |
430 NULL, | 432 NULL, |
431 NULL, | 433 NULL, |
432 NULL, | 434 NULL, |
433 &system_enable_referrers_, | 435 &system_enable_referrers_, |
| 436 NULL, |
434 NULL); | 437 NULL); |
435 if (command_line.HasSwitch(switches::kDisableExtensionsHttpThrottling)) | 438 if (command_line.HasSwitch(switches::kDisableExtensionsHttpThrottling)) |
436 network_delegate->NeverThrottleRequests(); | 439 network_delegate->NeverThrottleRequests(); |
437 globals_->system_network_delegate.reset(network_delegate); | 440 globals_->system_network_delegate.reset(network_delegate); |
438 globals_->host_resolver.reset( | 441 globals_->host_resolver.reset( |
439 CreateGlobalHostResolver(net_log_)); | 442 CreateGlobalHostResolver(net_log_)); |
440 globals_->cert_verifier.reset(net::CertVerifier::CreateDefault()); | 443 globals_->cert_verifier.reset(net::CertVerifier::CreateDefault()); |
441 globals_->transport_security_state.reset(new net::TransportSecurityState()); | 444 globals_->transport_security_state.reset(new net::TransportSecurityState()); |
442 globals_->ssl_config_service = GetSSLConfigService(); | 445 globals_->ssl_config_service = GetSSLConfigService(); |
443 globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory( | 446 globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory( |
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
692 new net::HttpNetworkLayer( | 695 new net::HttpNetworkLayer( |
693 new net::HttpNetworkSession(system_params))); | 696 new net::HttpNetworkSession(system_params))); |
694 globals_->system_ftp_transaction_factory.reset( | 697 globals_->system_ftp_transaction_factory.reset( |
695 new net::FtpNetworkLayer(globals_->host_resolver.get())); | 698 new net::FtpNetworkLayer(globals_->host_resolver.get())); |
696 globals_->system_request_context.reset( | 699 globals_->system_request_context.reset( |
697 ConstructSystemRequestContext(globals_, net_log_)); | 700 ConstructSystemRequestContext(globals_, net_log_)); |
698 | 701 |
699 sdch_manager_->set_sdch_fetcher( | 702 sdch_manager_->set_sdch_fetcher( |
700 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); | 703 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); |
701 } | 704 } |
OLD | NEW |