Convert //components/policy from scoped_ptr to std::unique_ptr

components/policy/core/common/registry_dict_win.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/policy/core/common/registry_dict_win.h"
 
 #include <utility>
 
 #include "base/json/json_reader.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_byteorder.h"
 #include "base/values.h"
 #include "base/win/registry.h"
 #include "components/policy/core/common/schema.h"
 
 using base::win::RegistryKeyIterator;
 using base::win::RegistryValueIterator;
 
 namespace policy {
 
 namespace {
 
 // Converts a value (as read from the registry) to meet |schema|, converting
 // types as necessary. Unconvertible types will show up as NULL values in the
 // result.
-scoped_ptr<base::Value> ConvertValue(const base::Value& value,
-                                     const Schema& schema) {
+std::unique_ptr<base::Value> ConvertValue(const base::Value& value,
+                                          const Schema& schema) {
   if (!schema.valid())
     return value.CreateDeepCopy();
 
   // If the type is good already, go with it.
   if (value.IsType(schema.type())) {
     // Recurse for complex types.
     const base::DictionaryValue* dict = NULL;
     const base::ListValue* list = NULL;
     if (value.GetAsDictionary(&dict)) {
-      scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue());
+      std::unique_ptr<base::DictionaryValue> result(
+          new base::DictionaryValue());
       for (base::DictionaryValue::Iterator entry(*dict); !entry.IsAtEnd();
            entry.Advance()) {
-        scoped_ptr<base::Value> converted =
+        std::unique_ptr<base::Value> converted =
             ConvertValue(entry.value(), schema.GetProperty(entry.key()));
         if (converted)
           result->SetWithoutPathExpansion(entry.key(), converted.release());
       }
       return std::move(result);
     } else if (value.GetAsList(&list)) {
-      scoped_ptr<base::ListValue> result(new base::ListValue());
+      std::unique_ptr<base::ListValue> result(new base::ListValue());
       for (base::ListValue::const_iterator entry(list->begin());
            entry != list->end(); ++entry) {
-        scoped_ptr<base::Value> converted =
+        std::unique_ptr<base::Value> converted =
             ConvertValue(**entry, schema.GetItems());
         if (converted)
           result->Append(converted.release());
       }
       return std::move(result);
     }
     return value.CreateDeepCopy();
   }
 
   // Else, do some conversions to map windows registry data types to JSON types.
   std::string string_value;
   int int_value = 0;
   switch (schema.type()) {
     case base::Value::TYPE_NULL: {
       return base::Value::CreateNullValue();
     }
     case base::Value::TYPE_BOOLEAN: {
       // Accept booleans encoded as either string or integer.
       if (value.GetAsInteger(&int_value) ||
           (value.GetAsString(&string_value) &&
            base::StringToInt(string_value, &int_value))) {
-        return scoped_ptr<base::Value>(
+        return std::unique_ptr<base::Value>(
             new base::FundamentalValue(int_value != 0));
       }
       break;
     }
     case base::Value::TYPE_INTEGER: {
       // Integers may be string-encoded.
       if (value.GetAsString(&string_value) &&
           base::StringToInt(string_value, &int_value)) {
-        return scoped_ptr<base::Value>(new base::FundamentalValue(int_value));
+        return std::unique_ptr<base::Value>(
+            new base::FundamentalValue(int_value));
       }
       break;
     }
     case base::Value::TYPE_DOUBLE: {
       // Doubles may be string-encoded or integer-encoded.
       double double_value = 0;
       if (value.GetAsDouble(&double_value) ||
           (value.GetAsString(&string_value) &&
            base::StringToDouble(string_value, &double_value))) {
-        return scoped_ptr<base::Value>(
+        return std::unique_ptr<base::Value>(
             new base::FundamentalValue(double_value));
       }
       break;
     }
     case base::Value::TYPE_LIST: {
       // Lists are encoded as subkeys with numbered value in the registry.
       const base::DictionaryValue* dict = NULL;
       if (value.GetAsDictionary(&dict)) {
-        scoped_ptr<base::ListValue> result(new base::ListValue());
+        std::unique_ptr<base::ListValue> result(new base::ListValue());
         for (int i = 1; ; ++i) {
           const base::Value* entry = NULL;
           if (!dict->Get(base::IntToString(i), &entry))
             break;
-          scoped_ptr<base::Value> converted =
+          std::unique_ptr<base::Value> converted =
               ConvertValue(*entry, schema.GetItems());
           if (converted)
             result->Append(converted.release());
         }
         return std::move(result);
       }
       // Fall through in order to accept lists encoded as JSON strings.
     }
     case base::Value::TYPE_DICTIONARY: {
       // Dictionaries may be encoded as JSON strings.
       if (value.GetAsString(&string_value)) {
-        scoped_ptr<base::Value> result = base::JSONReader::Read(string_value);
+        std::unique_ptr<base::Value> result =
+            base::JSONReader::Read(string_value);
         if (result && result->IsType(schema.type()))
           return result;
       }
       break;
     }
     case base::Value::TYPE_STRING:
     case base::Value::TYPE_BINARY:
       // No conversion possible.
       break;
   }
@@ skipping 21 matching lines @@
   KeyMap::iterator entry = keys_.find(name);
   return entry != keys_.end() ? entry->second : NULL;
 }
 
 const RegistryDict* RegistryDict::GetKey(const std::string& name) const {
   KeyMap::const_iterator entry = keys_.find(name);
   return entry != keys_.end() ? entry->second : NULL;
 }
 
 void RegistryDict::SetKey(const std::string& name,
-                          scoped_ptr<RegistryDict> dict) {
+                          std::unique_ptr<RegistryDict> dict) {
   if (!dict) {
     RemoveKey(name);
     return;
   }
 
   RegistryDict*& entry = keys_[name];
   delete entry;
   entry = dict.release();
 }
 
-scoped_ptr<RegistryDict> RegistryDict::RemoveKey(const std::string& name) {
-  scoped_ptr<RegistryDict> result;
+std::unique_ptr<RegistryDict> RegistryDict::RemoveKey(const std::string& name) {
+  std::unique_ptr<RegistryDict> result;
   KeyMap::iterator entry = keys_.find(name);
   if (entry != keys_.end()) {
     result.reset(entry->second);
     keys_.erase(entry);
   }
   return result;
 }
 
 void RegistryDict::ClearKeys() {
   STLDeleteValues(&keys_);
 }
 
 base::Value* RegistryDict::GetValue(const std::string& name) {
   ValueMap::iterator entry = values_.find(name);
   return entry != values_.end() ? entry->second : NULL;
 }
 
 const base::Value* RegistryDict::GetValue(const std::string& name) const {
   ValueMap::const_iterator entry = values_.find(name);
   return entry != values_.end() ? entry->second : NULL;
 }
 
 void RegistryDict::SetValue(const std::string& name,
-                            scoped_ptr<base::Value> dict) {
+                            std::unique_ptr<base::Value> dict) {
   if (!dict) {
     RemoveValue(name);
     return;
   }
 
   base::Value*& entry = values_[name];
   delete entry;
   entry = dict.release();
 }
 
-scoped_ptr<base::Value> RegistryDict::RemoveValue(const std::string& name) {
-  scoped_ptr<base::Value> result;
+std::unique_ptr<base::Value> RegistryDict::RemoveValue(
+    const std::string& name) {
+  std::unique_ptr<base::Value> result;
   ValueMap::iterator entry = values_.find(name);
   if (entry != values_.end()) {
     result.reset(entry->second);
     values_.erase(entry);
   }
   return result;
 }
 
 void RegistryDict::ClearValues() {
   STLDeleteValues(&values_);
@@ skipping 22 matching lines @@
 void RegistryDict::ReadRegistry(HKEY hive, const base::string16& root) {
   ClearKeys();
   ClearValues();
 
   // First, read all the values of the key.
   for (RegistryValueIterator it(hive, root.c_str()); it.Valid(); ++it) {
     const std::string name = base::UTF16ToUTF8(it.Name());
     switch (it.Type()) {
       case REG_SZ:
       case REG_EXPAND_SZ:
-        SetValue(name,
-                 scoped_ptr<base::Value>(
-                     new base::StringValue(base::UTF16ToUTF8(it.Value()))));
+        SetValue(name, std::unique_ptr<base::Value>(new base::StringValue(
+                           base::UTF16ToUTF8(it.Value()))));
         continue;
       case REG_DWORD_LITTLE_ENDIAN:
       case REG_DWORD_BIG_ENDIAN:
         if (it.ValueSize() == sizeof(DWORD)) {
           DWORD dword_value = *(reinterpret_cast<const DWORD*>(it.Value()));
           if (it.Type() == REG_DWORD_BIG_ENDIAN)
             dword_value = base::NetToHost32(dword_value);
           else
             dword_value = base::ByteSwapToLE32(dword_value);
           SetValue(name,
-                   scoped_ptr<base::Value>(new base::FundamentalValue(
+                   std::unique_ptr<base::Value>(new base::FundamentalValue(
                        static_cast<int>(dword_value))));
           continue;
         }
       case REG_NONE:
       case REG_LINK:
       case REG_MULTI_SZ:
       case REG_RESOURCE_LIST:
       case REG_FULL_RESOURCE_DESCRIPTOR:
       case REG_RESOURCE_REQUIREMENTS_LIST:
       case REG_QWORD_LITTLE_ENDIAN:
         // Unsupported type, message gets logged below.
         break;
     }
 
     LOG(WARNING) << "Failed to read hive " << hive << " at "
                  << root << "\\" << name
                  << " type " << it.Type();
   }
 
   // Recurse for all subkeys.
   for (RegistryKeyIterator it(hive, root.c_str()); it.Valid(); ++it) {
     std::string name(base::UTF16ToUTF8(it.Name()));
-    scoped_ptr<RegistryDict> subdict(new RegistryDict());
+    std::unique_ptr<RegistryDict> subdict(new RegistryDict());
     subdict->ReadRegistry(hive, root + L"\\" + it.Name());
     SetKey(name, std::move(subdict));
   }
 }
 
-scoped_ptr<base::Value> RegistryDict::ConvertToJSON(
+std::unique_ptr<base::Value> RegistryDict::ConvertToJSON(
     const Schema& schema) const {
   base::Value::Type type =
       schema.valid() ? schema.type() : base::Value::TYPE_DICTIONARY;
   switch (type) {
     case base::Value::TYPE_DICTIONARY: {
-      scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue());
+      std::unique_ptr<base::DictionaryValue> result(
+          new base::DictionaryValue());
       for (RegistryDict::ValueMap::const_iterator entry(values_.begin());
            entry != values_.end(); ++entry) {
         Schema subschema =
             schema.valid() ? schema.GetProperty(entry->first) : Schema();
-        scoped_ptr<base::Value> converted =
+        std::unique_ptr<base::Value> converted =
             ConvertValue(*entry->second, subschema);
         if (converted)
           result->SetWithoutPathExpansion(entry->first, converted.release());
       }
       for (RegistryDict::KeyMap::const_iterator entry(keys_.begin());
            entry != keys_.end(); ++entry) {
         Schema subschema =
             schema.valid() ? schema.GetProperty(entry->first) : Schema();
-        scoped_ptr<base::Value> converted =
+        std::unique_ptr<base::Value> converted =
             entry->second->ConvertToJSON(subschema);
         if (converted)
           result->SetWithoutPathExpansion(entry->first, converted.release());
       }
       return std::move(result);
     }
     case base::Value::TYPE_LIST: {
-      scoped_ptr<base::ListValue> result(new base::ListValue());
+      std::unique_ptr<base::ListValue> result(new base::ListValue());
       Schema item_schema = schema.valid() ? schema.GetItems() : Schema();
       for (int i = 1; ; ++i) {
         const std::string name(base::IntToString(i));
         const RegistryDict* key = GetKey(name);
         if (key) {
-          scoped_ptr<base::Value> converted = key->ConvertToJSON(item_schema);
+          std::unique_ptr<base::Value> converted =
+              key->ConvertToJSON(item_schema);
           if (converted)
             result->Append(converted.release());
           continue;
         }
         const base::Value* value = GetValue(name);
         if (value) {
-          scoped_ptr<base::Value> converted = ConvertValue(*value, item_schema);
+          std::unique_ptr<base::Value> converted =
+              ConvertValue(*value, item_schema);
           if (converted)
             result->Append(converted.release());
           continue;
         }
         break;
       }
       return std::move(result);
     }
     default:
       LOG(WARNING) << "Can't convert registry key to schema type " << type;
   }
 
   return nullptr;
 }
 
 }  // namespace policy