| Index: components/policy/core/common/cloud/user_cloud_policy_manager.cc
|
| diff --git a/components/policy/core/common/cloud/user_cloud_policy_manager.cc b/components/policy/core/common/cloud/user_cloud_policy_manager.cc
|
| index ed9e590c779b3e78433912fed2404fea9d633b0d..5af72fb2a9906c495dabbfbc3cbd3c8409ef2e9e 100644
|
| --- a/components/policy/core/common/cloud/user_cloud_policy_manager.cc
|
| +++ b/components/policy/core/common/cloud/user_cloud_policy_manager.cc
|
| @@ -26,15 +26,16 @@ UserCloudPolicyManager::UserCloudPolicyManager(
|
| const scoped_refptr<base::SequencedTaskRunner>& task_runner,
|
| const scoped_refptr<base::SequencedTaskRunner>& file_task_runner,
|
| const scoped_refptr<base::SequencedTaskRunner>& io_task_runner)
|
| - : CloudPolicyManager(
|
| - PolicyNamespaceKey(GetChromeUserPolicyType(), std::string()),
|
| - store.get(),
|
| - task_runner,
|
| - file_task_runner,
|
| - io_task_runner),
|
| + : CloudPolicyManager(GetChromeUserPolicyType(),
|
| + std::string(),
|
| + store.get(),
|
| + task_runner,
|
| + file_task_runner,
|
| + io_task_runner),
|
| store_(store.Pass()),
|
| component_policy_cache_path_(component_policy_cache_path),
|
| - external_data_manager_(external_data_manager.Pass()) {}
|
| + external_data_manager_(external_data_manager.Pass()) {
|
| +}
|
|
|
| UserCloudPolicyManager::~UserCloudPolicyManager() {}
|
|
|
| @@ -74,7 +75,7 @@ UserCloudPolicyManager::CreateCloudPolicyClient(
|
| std::string(),
|
| kPolicyVerificationKeyHash,
|
| USER_AFFILIATION_NONE,
|
| - NULL,
|
| + nullptr,
|
| device_management_service,
|
| request_context)).Pass();
|
| }
|
|
|