Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(821)

Unified Diff: components/policy/core/common/cloud/user_cloud_policy_store_base.h

Issue 1902633006: Convert //components/policy from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments and use namespace alias Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/policy/core/common/cloud/user_cloud_policy_store_base.h
diff --git a/components/policy/core/common/cloud/user_cloud_policy_store_base.h b/components/policy/core/common/cloud/user_cloud_policy_store_base.h
index 46c1310bd672060db48e771d86a994b802cd5136..7356b5d0f79d4848da4fe89a6f1224ce00346efd 100644
--- a/components/policy/core/common/cloud/user_cloud_policy_store_base.h
+++ b/components/policy/core/common/cloud/user_cloud_policy_store_base.h
@@ -5,11 +5,11 @@
#ifndef COMPONENTS_POLICY_CORE_COMMON_CLOUD_USER_CLOUD_POLICY_STORE_BASE_H_
#define COMPONENTS_POLICY_CORE_COMMON_CLOUD_USER_CLOUD_POLICY_STORE_BASE_H_
+#include <memory>
#include <string>
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "components/policy/core/common/cloud/cloud_policy_store.h"
#include "components/policy/core/common/cloud/cloud_policy_validator.h"
@@ -32,14 +32,14 @@ class POLICY_EXPORT UserCloudPolicyStoreBase : public CloudPolicyStore {
protected:
// Creates a validator configured to validate a user policy. The caller owns
// the resulting object until StartValidation() is invoked.
- scoped_ptr<UserCloudPolicyValidator> CreateValidator(
- scoped_ptr<enterprise_management::PolicyFetchResponse> policy,
+ std::unique_ptr<UserCloudPolicyValidator> CreateValidator(
+ std::unique_ptr<enterprise_management::PolicyFetchResponse> policy,
CloudPolicyValidatorBase::ValidateTimestampOption option);
// Sets |policy_data| and |payload| as the active policy.
void InstallPolicy(
- scoped_ptr<enterprise_management::PolicyData> policy_data,
- scoped_ptr<enterprise_management::CloudPolicySettings> payload);
+ std::unique_ptr<enterprise_management::PolicyData> policy_data,
+ std::unique_ptr<enterprise_management::CloudPolicySettings> payload);
scoped_refptr<base::SequencedTaskRunner> background_task_runner() const {
return background_task_runner_;

Powered by Google App Engine
This is Rietveld 408576698