| Index: components/policy/core/common/cloud/cloud_policy_manager.cc
|
| diff --git a/components/policy/core/common/cloud/cloud_policy_manager.cc b/components/policy/core/common/cloud/cloud_policy_manager.cc
|
| index 4c523bf3ee99860ca81875eebde00f7e2197764e..db6a3ec2da9a3eaca36c75a6b95802b278507e5a 100644
|
| --- a/components/policy/core/common/cloud/cloud_policy_manager.cc
|
| +++ b/components/policy/core/common/cloud/cloud_policy_manager.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "components/policy/core/common/cloud/cloud_policy_manager.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| #include "base/command_line.h"
|
| @@ -99,7 +101,7 @@ void CloudPolicyManager::CheckAndPublishPolicy() {
|
| &bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())));
|
| if (component_policy_service_)
|
| bundle->MergeFrom(component_policy_service_->policy());
|
| - UpdatePolicy(bundle.Pass());
|
| + UpdatePolicy(std::move(bundle));
|
| }
|
| }
|
|
|
| @@ -132,14 +134,8 @@ void CloudPolicyManager::CreateComponentCloudPolicyService(
|
| scoped_ptr<ResourceCache> resource_cache(
|
| new ResourceCache(policy_cache_path, file_task_runner_));
|
| component_policy_service_.reset(new ComponentCloudPolicyService(
|
| - this,
|
| - schema_registry(),
|
| - core(),
|
| - client,
|
| - resource_cache.Pass(),
|
| - request_context,
|
| - file_task_runner_,
|
| - io_task_runner_));
|
| + this, schema_registry(), core(), client, std::move(resource_cache),
|
| + request_context, file_task_runner_, io_task_runner_));
|
| #endif // !defined(OS_ANDROID) && !defined(OS_IOS)
|
| }
|
|
|
|
|