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 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
591 } | 591 } |
592 } | 592 } |
593 | 593 |
594 std::unique_ptr<net::ExternalEstimateProvider> external_estimate_provider; | 594 std::unique_ptr<net::ExternalEstimateProvider> external_estimate_provider; |
595 #if defined(OS_ANDROID) | 595 #if defined(OS_ANDROID) |
596 external_estimate_provider.reset( | 596 external_estimate_provider.reset( |
597 new chrome::android::ExternalEstimateProviderAndroid()); | 597 new chrome::android::ExternalEstimateProviderAndroid()); |
598 #endif // defined(OS_ANDROID) | 598 #endif // defined(OS_ANDROID) |
599 // Pass ownership. | 599 // Pass ownership. |
600 globals_->network_quality_estimator.reset(new net::NetworkQualityEstimator( | 600 globals_->network_quality_estimator.reset(new net::NetworkQualityEstimator( |
601 std::move(external_estimate_provider), network_quality_estimator_params, | 601 std::move(external_estimate_provider), |
602 base::MakeUnique<net::nqe::internal::NetworkQualityEstimatorParams>( | |
mmenke
2017/05/24 15:49:04
Code outside net/ shouldn't be using methods in an
| |
603 network_quality_estimator_params), | |
602 net_log_)); | 604 net_log_)); |
603 globals_->network_quality_observer = content::CreateNetworkQualityObserver( | 605 globals_->network_quality_observer = content::CreateNetworkQualityObserver( |
604 globals_->network_quality_estimator.get()); | 606 globals_->network_quality_estimator.get()); |
605 | 607 |
606 UpdateDnsClientEnabled(); | 608 UpdateDnsClientEnabled(); |
607 #if defined(OS_CHROMEOS) | 609 #if defined(OS_CHROMEOS) |
608 // Creates a CertVerifyProc that doesn't allow any profile-provided certs. | 610 // Creates a CertVerifyProc that doesn't allow any profile-provided certs. |
609 globals_->cert_verifier = base::MakeUnique<net::CachingCertVerifier>( | 611 globals_->cert_verifier = base::MakeUnique<net::CachingCertVerifier>( |
610 base::MakeUnique<net::MultiThreadedCertVerifier>( | 612 base::MakeUnique<net::MultiThreadedCertVerifier>( |
611 new chromeos::CertVerifyProcChromeOS())); | 613 new chromeos::CertVerifyProcChromeOS())); |
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1094 | 1096 |
1095 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the | 1097 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the |
1096 // system URLRequestContext too. There's no reason this should be tied to a | 1098 // system URLRequestContext too. There's no reason this should be tied to a |
1097 // profile. | 1099 // profile. |
1098 return context; | 1100 return context; |
1099 } | 1101 } |
1100 | 1102 |
1101 metrics::UpdateUsagePrefCallbackType IOThread::GetMetricsDataUseForwarder() { | 1103 metrics::UpdateUsagePrefCallbackType IOThread::GetMetricsDataUseForwarder() { |
1102 return base::Bind(&UpdateMetricsUsagePrefsOnUIThread); | 1104 return base::Bind(&UpdateMetricsUsagePrefsOnUIThread); |
1103 } | 1105 } |
OLD | NEW |