Index: chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc |
diff --git a/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc b/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc |
index 867e06bc3e7ac4c35affb0abb3cad1bf14e653cc..eaf96155c13b2df8abf5c042e6291ae86983d14a 100644 |
--- a/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc |
+++ b/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc |
@@ -4,6 +4,8 @@ |
#include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" |
+#include <utility> |
+ |
#include "base/files/file_path.h" |
#include "base/logging.h" |
#include "base/macros.h" |
@@ -153,16 +155,13 @@ UserCloudPolicyManagerFactory::CreateManagerForOriginalBrowserContext( |
scoped_ptr<UserCloudPolicyManager> manager; |
manager.reset(new UserCloudPolicyManager( |
- store.Pass(), |
- component_policy_cache_dir, |
+ std::move(store), component_policy_cache_dir, |
scoped_ptr<CloudExternalDataManager>(), |
- base::ThreadTaskRunnerHandle::Get(), |
- file_task_runner, |
- io_task_runner)); |
+ base::ThreadTaskRunnerHandle::Get(), file_task_runner, io_task_runner)); |
manager->Init( |
SchemaRegistryServiceFactory::GetForContext(context)->registry()); |
manager_wrappers_[context] = new ManagerWrapper(manager.get()); |
- return manager.Pass(); |
+ return manager; |
} |
UserCloudPolicyManager* |