| 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 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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::InitializeReferrersEnabled(&system_enable_referrers_, |
| 360 local_state); | 360 local_state); |
| 361 ssl_config_service_manager_.reset( | 361 ssl_config_service_manager_.reset( |
| 362 SSLConfigServiceManager::CreateDefaultManager(local_state)); | 362 SSLConfigServiceManager::CreateDefaultManager(local_state, NULL)); |
| 363 | 363 |
| 364 BrowserThread::SetDelegate(BrowserThread::IO, this); | 364 BrowserThread::SetDelegate(BrowserThread::IO, this); |
| 365 } | 365 } |
| 366 | 366 |
| 367 IOThread::~IOThread() { | 367 IOThread::~IOThread() { |
| 368 // This isn't needed for production code, but in tests, IOThread may | 368 // This isn't needed for production code, but in tests, IOThread may |
| 369 // be multiply constructed. | 369 // be multiply constructed. |
| 370 BrowserThread::SetDelegate(BrowserThread::IO, NULL); | 370 BrowserThread::SetDelegate(BrowserThread::IO, NULL); |
| 371 | 371 |
| 372 if (pref_proxy_config_tracker_.get()) | 372 if (pref_proxy_config_tracker_.get()) |
| (...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 692 new net::HttpNetworkLayer( | 692 new net::HttpNetworkLayer( |
| 693 new net::HttpNetworkSession(system_params))); | 693 new net::HttpNetworkSession(system_params))); |
| 694 globals_->system_ftp_transaction_factory.reset( | 694 globals_->system_ftp_transaction_factory.reset( |
| 695 new net::FtpNetworkLayer(globals_->host_resolver.get())); | 695 new net::FtpNetworkLayer(globals_->host_resolver.get())); |
| 696 globals_->system_request_context.reset( | 696 globals_->system_request_context.reset( |
| 697 ConstructSystemRequestContext(globals_, net_log_)); | 697 ConstructSystemRequestContext(globals_, net_log_)); |
| 698 | 698 |
| 699 sdch_manager_->set_sdch_fetcher( | 699 sdch_manager_->set_sdch_fetcher( |
| 700 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); | 700 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); |
| 701 } | 701 } |
| OLD | NEW |