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 446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
457 auth_delegate_whitelist_ = local_state->GetString( | 457 auth_delegate_whitelist_ = local_state->GetString( |
458 prefs::kAuthNegotiateDelegateWhitelist); | 458 prefs::kAuthNegotiateDelegateWhitelist); |
459 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); | 459 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); |
460 pref_proxy_config_tracker_.reset( | 460 pref_proxy_config_tracker_.reset( |
461 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 461 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
462 local_state)); | 462 local_state)); |
463 ChromeNetworkDelegate::InitializePrefsOnUIThread( | 463 ChromeNetworkDelegate::InitializePrefsOnUIThread( |
464 &system_enable_referrers_, | 464 &system_enable_referrers_, |
465 NULL, | 465 NULL, |
466 NULL, | 466 NULL, |
| 467 NULL, |
467 local_state); | 468 local_state); |
468 ssl_config_service_manager_.reset( | 469 ssl_config_service_manager_.reset( |
469 SSLConfigServiceManager::CreateDefaultManager(local_state)); | 470 SSLConfigServiceManager::CreateDefaultManager(local_state)); |
470 | 471 |
471 base::Value* dns_client_enabled_default = new base::FundamentalValue( | 472 base::Value* dns_client_enabled_default = new base::FundamentalValue( |
472 chrome_browser_net::ConfigureAsyncDnsFieldTrial()); | 473 chrome_browser_net::ConfigureAsyncDnsFieldTrial()); |
473 local_state->SetDefaultPrefValue(prefs::kBuiltInDnsClientEnabled, | 474 local_state->SetDefaultPrefValue(prefs::kBuiltInDnsClientEnabled, |
474 dns_client_enabled_default); | 475 dns_client_enabled_default); |
475 | 476 |
476 dns_client_enabled_.Init(prefs::kBuiltInDnsClientEnabled, | 477 dns_client_enabled_.Init(prefs::kBuiltInDnsClientEnabled, |
(...skipping 890 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1367 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); | 1368 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); |
1368 for (size_t i = 0; i < supported_versions.size(); ++i) { | 1369 for (size_t i = 0; i < supported_versions.size(); ++i) { |
1369 net::QuicVersion version = supported_versions[i]; | 1370 net::QuicVersion version = supported_versions[i]; |
1370 if (net::QuicVersionToString(version) == quic_version) { | 1371 if (net::QuicVersionToString(version) == quic_version) { |
1371 return version; | 1372 return version; |
1372 } | 1373 } |
1373 } | 1374 } |
1374 | 1375 |
1375 return net::QUIC_VERSION_UNSUPPORTED; | 1376 return net::QUIC_VERSION_UNSUPPORTED; |
1376 } | 1377 } |
OLD | NEW |