| Index: chrome/browser/chromeos/policy/user_network_configuration_updater.cc
|
| diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater.cc b/chrome/browser/chromeos/policy/user_network_configuration_updater.cc
|
| index 3221bf1074be2be57df59f2d4b2506e6e9023020..6fac05ec7aaf0d4f21af34a3429423a21f2f4ce8 100644
|
| --- a/chrome/browser/chromeos/policy/user_network_configuration_updater.cc
|
| +++ b/chrome/browser/chromeos/policy/user_network_configuration_updater.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "chrome/browser/chromeos/policy/user_network_configuration_updater.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| #include "base/logging.h"
|
| @@ -39,7 +41,7 @@ UserNetworkConfigurationUpdater::CreateForUserPolicy(
|
| policy_service,
|
| network_config_handler));
|
| updater->Init();
|
| - return updater.Pass();
|
| + return updater;
|
| }
|
|
|
| void UserNetworkConfigurationUpdater::AddTrustedCertsObserver(
|
| @@ -77,7 +79,7 @@ UserNetworkConfigurationUpdater::UserNetworkConfigurationUpdater(
|
|
|
| void UserNetworkConfigurationUpdater::SetCertificateImporterForTest(
|
| scoped_ptr<chromeos::onc::CertificateImporter> certificate_importer) {
|
| - SetCertificateImporter(certificate_importer.Pass());
|
| + SetCertificateImporter(std::move(certificate_importer));
|
| }
|
|
|
| void UserNetworkConfigurationUpdater::GetWebTrustedCertificates(
|
| @@ -148,7 +150,7 @@ void UserNetworkConfigurationUpdater::CreateAndSetCertificateImporter(
|
|
|
| void UserNetworkConfigurationUpdater::SetCertificateImporter(
|
| scoped_ptr<chromeos::onc::CertificateImporter> certificate_importer) {
|
| - certificate_importer_ = certificate_importer.Pass();
|
| + certificate_importer_ = std::move(certificate_importer);
|
|
|
| if (pending_certificates_onc_)
|
| ImportCertificates(*pending_certificates_onc_);
|
|
|