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

Unified Diff: components/policy/core/common/registry_dict_win.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/registry_dict_win.h
diff --git a/components/policy/core/common/registry_dict_win.h b/components/policy/core/common/registry_dict_win.h
index 27cf728b06d9535d086e903de397585f1d1340ab..8f8a9e8c40cca058fc069affc1c855283f9f14c4 100644
--- a/components/policy/core/common/registry_dict_win.h
+++ b/components/policy/core/common/registry_dict_win.h
@@ -8,10 +8,10 @@
#include <windows.h>
#include <map>
+#include <memory>
#include <string>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
#include "components/policy/policy_export.h"
@@ -45,9 +45,9 @@ class POLICY_EXPORT RegistryDict {
RegistryDict* GetKey(const std::string& name);
const RegistryDict* GetKey(const std::string& name) const;
// Sets a key. If |dict| is NULL, clears that key.
- void SetKey(const std::string& name, scoped_ptr<RegistryDict> dict);
+ void SetKey(const std::string& name, std::unique_ptr<RegistryDict> dict);
// Removes a key. If the key doesn't exist, NULL is returned.
- scoped_ptr<RegistryDict> RemoveKey(const std::string& name);
+ std::unique_ptr<RegistryDict> RemoveKey(const std::string& name);
// Clears all keys.
void ClearKeys();
@@ -55,9 +55,9 @@ class POLICY_EXPORT RegistryDict {
base::Value* GetValue(const std::string& name);
const base::Value* GetValue(const std::string& name) const;
// Sets a value. If |value| is NULL, removes the value.
- void SetValue(const std::string& name, scoped_ptr<base::Value> value);
+ void SetValue(const std::string& name, std::unique_ptr<base::Value> value);
// Removes a value. If the value doesn't exist, NULL is returned.
- scoped_ptr<base::Value> RemoveValue(const std::string& name);
+ std::unique_ptr<base::Value> RemoveValue(const std::string& name);
// Clears all values.
void ClearValues();
@@ -74,7 +74,7 @@ class POLICY_EXPORT RegistryDict {
// collisions, the key wins. |schema| is used to determine the expected type
// for each policy.
// The returned object is either a base::DictionaryValue or a base::ListValue.
- scoped_ptr<base::Value> ConvertToJSON(const Schema& schema) const;
+ std::unique_ptr<base::Value> ConvertToJSON(const Schema& schema) const;
const KeyMap& keys() const { return keys_; }
const ValueMap& values() const { return values_; }
« no previous file with comments | « components/policy/core/common/proxy_policy_provider_unittest.cc ('k') | components/policy/core/common/registry_dict_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698