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