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

Unified Diff: components/policy/core/common/policy_map.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/policy_map.h
diff --git a/components/policy/core/common/policy_map.h b/components/policy/core/common/policy_map.h
index 9af8c53dee57075d9f82b5a8de97b167a61c4f7d..9960531f64e1dea99dbb3baaaf922c44de7632e1 100644
--- a/components/policy/core/common/policy_map.h
+++ b/components/policy/core/common/policy_map.h
@@ -8,11 +8,11 @@
#include <stddef.h>
#include <map>
+#include <memory>
#include <set>
#include <string>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/values.h"
#include "components/policy/core/common/external_data_fetcher.h"
#include "components/policy/core/common/policy_types.h"
@@ -40,7 +40,7 @@ class POLICY_EXPORT PolicyMap {
void DeleteOwnedMembers();
// Returns a copy of |this|.
- scoped_ptr<Entry> DeepCopy() const;
+ std::unique_ptr<Entry> DeepCopy() const;
// Returns true if |this| has higher priority than |other|.
bool has_higher_priority_than(const Entry& other) const;
@@ -83,7 +83,7 @@ class POLICY_EXPORT PolicyMap {
void CopyFrom(const PolicyMap& other);
// Returns a copy of |this|.
- scoped_ptr<PolicyMap> DeepCopy() const;
+ std::unique_ptr<PolicyMap> DeepCopy() const;
// Merges policies from |other| into |this|. Existing policies are only
// overridden by those in |other| if they have a higher priority, as defined
« no previous file with comments | « components/policy/core/common/policy_loader_win_unittest.cc ('k') | components/policy/core/common/policy_map.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698