| 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 <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/base64.h" | 10 #include "base/base64.h" |
| (...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 558 variations::GetVariationParams(kNetworkQualityEstimatorFieldTrialName, | 558 variations::GetVariationParams(kNetworkQualityEstimatorFieldTrialName, |
| 559 &network_quality_estimator_params); | 559 &network_quality_estimator_params); |
| 560 | 560 |
| 561 std::unique_ptr<net::ExternalEstimateProvider> external_estimate_provider; | 561 std::unique_ptr<net::ExternalEstimateProvider> external_estimate_provider; |
| 562 #if defined(OS_ANDROID) | 562 #if defined(OS_ANDROID) |
| 563 external_estimate_provider.reset( | 563 external_estimate_provider.reset( |
| 564 new chrome::android::ExternalEstimateProviderAndroid()); | 564 new chrome::android::ExternalEstimateProviderAndroid()); |
| 565 #endif // defined(OS_ANDROID) | 565 #endif // defined(OS_ANDROID) |
| 566 // Pass ownership. | 566 // Pass ownership. |
| 567 globals_->network_quality_estimator.reset(new net::NetworkQualityEstimator( | 567 globals_->network_quality_estimator.reset(new net::NetworkQualityEstimator( |
| 568 std::move(external_estimate_provider), network_quality_estimator_params)); | 568 std::move(external_estimate_provider), network_quality_estimator_params, |
| 569 net_log_)); |
| 569 | 570 |
| 570 UpdateDnsClientEnabled(); | 571 UpdateDnsClientEnabled(); |
| 571 #if defined(OS_CHROMEOS) | 572 #if defined(OS_CHROMEOS) |
| 572 // Creates a CertVerifyProc that doesn't allow any profile-provided certs. | 573 // Creates a CertVerifyProc that doesn't allow any profile-provided certs. |
| 573 globals_->cert_verifier = base::MakeUnique<net::CachingCertVerifier>( | 574 globals_->cert_verifier = base::MakeUnique<net::CachingCertVerifier>( |
| 574 base::MakeUnique<net::MultiThreadedCertVerifier>( | 575 base::MakeUnique<net::MultiThreadedCertVerifier>( |
| 575 new chromeos::CertVerifyProcChromeOS())); | 576 new chromeos::CertVerifyProcChromeOS())); |
| 576 #else | 577 #else |
| 577 globals_->cert_verifier = net::CertVerifier::CreateDefault(); | 578 globals_->cert_verifier = net::CertVerifier::CreateDefault(); |
| 578 #endif | 579 #endif |
| (...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1099 | 1100 |
| 1100 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the | 1101 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the |
| 1101 // system URLRequestContext too. There's no reason this should be tied to a | 1102 // system URLRequestContext too. There's no reason this should be tied to a |
| 1102 // profile. | 1103 // profile. |
| 1103 return context; | 1104 return context; |
| 1104 } | 1105 } |
| 1105 | 1106 |
| 1106 metrics::UpdateUsagePrefCallbackType IOThread::GetMetricsDataUseForwarder() { | 1107 metrics::UpdateUsagePrefCallbackType IOThread::GetMetricsDataUseForwarder() { |
| 1107 return base::Bind(&UpdateMetricsUsagePrefsOnUIThread); | 1108 return base::Bind(&UpdateMetricsUsagePrefsOnUIThread); |
| 1108 } | 1109 } |
| OLD | NEW |