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/base64.h" | 9 #include "base/base64.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
446 auth_delegate_whitelist_ = local_state->GetString( | 446 auth_delegate_whitelist_ = local_state->GetString( |
447 prefs::kAuthNegotiateDelegateWhitelist); | 447 prefs::kAuthNegotiateDelegateWhitelist); |
448 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); | 448 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); |
449 pref_proxy_config_tracker_.reset( | 449 pref_proxy_config_tracker_.reset( |
450 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 450 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
451 local_state)); | 451 local_state)); |
452 ChromeNetworkDelegate::InitializePrefsOnUIThread( | 452 ChromeNetworkDelegate::InitializePrefsOnUIThread( |
453 &system_enable_referrers_, | 453 &system_enable_referrers_, |
454 NULL, | 454 NULL, |
455 NULL, | 455 NULL, |
| 456 NULL, |
456 local_state); | 457 local_state); |
457 ssl_config_service_manager_.reset( | 458 ssl_config_service_manager_.reset( |
458 SSLConfigServiceManager::CreateDefaultManager(local_state)); | 459 SSLConfigServiceManager::CreateDefaultManager(local_state)); |
459 | 460 |
460 base::Value* dns_client_enabled_default = new base::FundamentalValue( | 461 base::Value* dns_client_enabled_default = new base::FundamentalValue( |
461 chrome_browser_net::ConfigureAsyncDnsFieldTrial()); | 462 chrome_browser_net::ConfigureAsyncDnsFieldTrial()); |
462 local_state->SetDefaultPrefValue(prefs::kBuiltInDnsClientEnabled, | 463 local_state->SetDefaultPrefValue(prefs::kBuiltInDnsClientEnabled, |
463 dns_client_enabled_default); | 464 dns_client_enabled_default); |
464 | 465 |
465 dns_client_enabled_.Init(prefs::kBuiltInDnsClientEnabled, | 466 dns_client_enabled_.Init(prefs::kBuiltInDnsClientEnabled, |
(...skipping 830 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1296 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); | 1297 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); |
1297 for (size_t i = 0; i < supported_versions.size(); ++i) { | 1298 for (size_t i = 0; i < supported_versions.size(); ++i) { |
1298 net::QuicVersion version = supported_versions[i]; | 1299 net::QuicVersion version = supported_versions[i]; |
1299 if (net::QuicVersionToString(version) == quic_version) { | 1300 if (net::QuicVersionToString(version) == quic_version) { |
1300 return version; | 1301 return version; |
1301 } | 1302 } |
1302 } | 1303 } |
1303 | 1304 |
1304 return net::QUIC_VERSION_UNSUPPORTED; | 1305 return net::QUIC_VERSION_UNSUPPORTED; |
1305 } | 1306 } |
OLD | NEW |