commit c963c714c99f34bd80b392d9896ca9cecd66fb6d
author dcheng <dcheng@chromium.org> Fri Apr 08 03:55:22 2016
committer Commit bot <commit-bot@chromium.org> Fri Apr 08 03:56:38 2016
tree 86d63349159f8a16d3de5b7881aad6b3ffa9bff3
parent 70024238824031e03c1b6ace610403e6b7db0e0d

Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr

BUG=554298

Review URL: https://codereview.chromium.org/1871713002

Cr-Commit-Position: refs/heads/master@{#385980}

chrome/browser/extensions/policy_handlers.cc

diff --git a/chrome/browser/extensions/policy_handlers.cc b/chrome/browser/extensions/policy_handlers.cc
index 49f6547..185bdd8a 100644
--- a/chrome/browser/extensions/policy_handlers.cc
+++ b/chrome/browser/extensions/policy_handlers.cc
@@ -43,7 +43,7 @@
 void ExtensionListPolicyHandler::ApplyPolicySettings(
     const policy::PolicyMap& policies,
     PrefValueMap* prefs) {
-  scoped_ptr<base::ListValue> list;
+  std::unique_ptr<base::ListValue> list;
   policy::PolicyErrorMap errors;
   if (CheckAndGetList(policies, &errors, &list) && list)
     prefs->SetValue(pref_path(), std::move(list));
@@ -56,7 +56,7 @@
 bool ExtensionListPolicyHandler::CheckAndGetList(
     const policy::PolicyMap& policies,
     policy::PolicyErrorMap* errors,
-    scoped_ptr<base::ListValue>* extension_ids) {
+    std::unique_ptr<base::ListValue>* extension_ids) {
   if (extension_ids)
     extension_ids->reset();
 
@@ -74,7 +74,7 @@
   }
 
   // Filter the list, rejecting any invalid extension IDs.
-  scoped_ptr<base::ListValue> filtered_list(new base::ListValue());
+  std::unique_ptr<base::ListValue> filtered_list(new base::ListValue());
   for (base::ListValue::const_iterator entry(list_value->begin());
        entry != list_value->end(); ++entry) {
     std::string id;
@@ -121,7 +121,7 @@
     const policy::PolicyMap& policies,
     PrefValueMap* prefs) {
   const base::Value* value = NULL;
-  scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
+  std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
   if (CheckAndGetValue(policies, NULL, &value) &&
       value &&
       ParseList(value, dict.get(), NULL)) {
@@ -266,7 +266,7 @@
 bool ExtensionSettingsPolicyHandler::CheckPolicySettings(
     const policy::PolicyMap& policies,
     policy::PolicyErrorMap* errors) {
-  scoped_ptr<base::Value> policy_value;
+  std::unique_ptr<base::Value> policy_value;
   if (!CheckAndGetValue(policies, errors, &policy_value))
     return false;
   if (!policy_value)
@@ -320,7 +320,7 @@
 void ExtensionSettingsPolicyHandler::ApplyPolicySettings(
     const policy::PolicyMap& policies,
     PrefValueMap* prefs) {
-  scoped_ptr<base::Value> policy_value;
+  std::unique_ptr<base::Value> policy_value;
   if (!CheckAndGetValue(policies, NULL, &policy_value) || !policy_value)
     return;
   prefs->SetValue(pref_names::kExtensionManagement, std::move(policy_value));