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 555 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
566 } | 566 } |
567 } | 567 } |
568 | 568 |
569 std::unique_ptr<net::ExternalEstimateProvider> external_estimate_provider; | 569 std::unique_ptr<net::ExternalEstimateProvider> external_estimate_provider; |
570 #if defined(OS_ANDROID) | 570 #if defined(OS_ANDROID) |
571 external_estimate_provider.reset( | 571 external_estimate_provider.reset( |
572 new chrome::android::ExternalEstimateProviderAndroid()); | 572 new chrome::android::ExternalEstimateProviderAndroid()); |
573 #endif // defined(OS_ANDROID) | 573 #endif // defined(OS_ANDROID) |
574 // Pass ownership. | 574 // Pass ownership. |
575 globals_->network_quality_estimator.reset(new net::NetworkQualityEstimator( | 575 globals_->network_quality_estimator.reset(new net::NetworkQualityEstimator( |
576 std::move(external_estimate_provider), network_quality_estimator_params, | 576 std::move(external_estimate_provider), |
| 577 base::MakeUnique<net::NetworkQualityEstimatorParams>( |
| 578 network_quality_estimator_params), |
577 net_log_)); | 579 net_log_)); |
578 globals_->network_quality_observer = content::CreateNetworkQualityObserver( | 580 globals_->network_quality_observer = content::CreateNetworkQualityObserver( |
579 globals_->network_quality_estimator.get()); | 581 globals_->network_quality_estimator.get()); |
580 | 582 |
581 UpdateDnsClientEnabled(); | 583 UpdateDnsClientEnabled(); |
582 #if defined(OS_CHROMEOS) | 584 #if defined(OS_CHROMEOS) |
583 // Creates a CertVerifyProc that doesn't allow any profile-provided certs. | 585 // Creates a CertVerifyProc that doesn't allow any profile-provided certs. |
584 globals_->cert_verifier = base::MakeUnique<net::CachingCertVerifier>( | 586 globals_->cert_verifier = base::MakeUnique<net::CachingCertVerifier>( |
585 base::MakeUnique<net::MultiThreadedCertVerifier>( | 587 base::MakeUnique<net::MultiThreadedCertVerifier>( |
586 new chromeos::CertVerifyProcChromeOS())); | 588 new chromeos::CertVerifyProcChromeOS())); |
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1010 GetSwitchValueAsInt(command_line, switches::kTestingFixedHttpsPort); | 1012 GetSwitchValueAsInt(command_line, switches::kTestingFixedHttpsPort); |
1011 } | 1013 } |
1012 | 1014 |
1013 params->http_09_on_non_default_ports_enabled = | 1015 params->http_09_on_non_default_ports_enabled = |
1014 http_09_on_non_default_ports_enabled; | 1016 http_09_on_non_default_ports_enabled; |
1015 } | 1017 } |
1016 | 1018 |
1017 metrics::UpdateUsagePrefCallbackType IOThread::GetMetricsDataUseForwarder() { | 1019 metrics::UpdateUsagePrefCallbackType IOThread::GetMetricsDataUseForwarder() { |
1018 return base::Bind(&UpdateMetricsUsagePrefsOnUIThread); | 1020 return base::Bind(&UpdateMetricsUsagePrefsOnUIThread); |
1019 } | 1021 } |
OLD | NEW |