Convert Pass()→std::move() on Windows

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) {
   if (!schema.valid())
-    return make_scoped_ptr(value.DeepCopy()).Pass();
+    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());
       for (base::DictionaryValue::Iterator entry(*dict); !entry.IsAtEnd();
            entry.Advance()) {
         scoped_ptr<base::Value> converted =
             ConvertValue(entry.value(), schema.GetProperty(entry.key()));
         if (converted)
           result->SetWithoutPathExpansion(entry.key(), converted.release());
       }
-      return result.Pass();
+      return std::move(result);
     } else if (value.GetAsList(&list)) {
       scoped_ptr<base::ListValue> result(new base::ListValue());
       for (base::ListValue::const_iterator entry(list->begin());
            entry != list->end(); ++entry) {
         scoped_ptr<base::Value> converted =
             ConvertValue(**entry, schema.GetItems());
         if (converted)
           result->Append(converted.release());
       }
-      return result.Pass();
+      return std::move(result);
     }
-    return make_scoped_ptr(value.DeepCopy());
+    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: {
@@ skipping 32 matching lines @@
         scoped_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 =
               ConvertValue(*entry, schema.GetItems());
           if (converted)
             result->Append(converted.release());
         }
-        return result.Pass();
+        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);
         if (result && result->IsType(schema.type()))
-          return result.Pass();
+          return result;
       }
       break;
     }
     case base::Value::TYPE_STRING:
     case base::Value::TYPE_BINARY:
       // No conversion possible.
       break;
   }
 
   LOG(WARNING) << "Failed to convert " << value.GetType()
@@ skipping 37 matching lines @@
   entry = dict.release();
 }
 
 scoped_ptr<RegistryDict> RegistryDict::RemoveKey(const std::string& name) {
   scoped_ptr<RegistryDict> result;
   KeyMap::iterator entry = keys_.find(name);
   if (entry != keys_.end()) {
     result.reset(entry->second);
     keys_.erase(entry);
   }
-  return result.Pass();
+  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;
 }
@@ skipping 15 matching lines @@
   entry = dict.release();
 }
 
 scoped_ptr<base::Value> RegistryDict::RemoveValue(const std::string& name) {
   scoped_ptr<base::Value> result;
   ValueMap::iterator entry = values_.find(name);
   if (entry != values_.end()) {
     result.reset(entry->second);
     values_.erase(entry);
   }
-  return result.Pass();
+  return result;
 }
 
 void RegistryDict::ClearValues() {
   STLDeleteValues(&values_);
 }
 
 void RegistryDict::Merge(const RegistryDict& other) {
   for (KeyMap::const_iterator entry(other.keys_.begin());
        entry != other.keys_.end(); ++entry) {
     RegistryDict*& subdict = keys_[entry->first];
     if (!subdict)
       subdict = new RegistryDict();
     subdict->Merge(*entry->second);
   }
 
   for (ValueMap::const_iterator entry(other.values_.begin());
        entry != other.values_.end(); ++entry) {
-    SetValue(entry->first, make_scoped_ptr(entry->second->DeepCopy()).Pass());
+    SetValue(entry->first, entry->second->CreateDeepCopy());
   }
 }
 
 void RegistryDict::Swap(RegistryDict* other) {
   keys_.swap(other->keys_);
   values_.swap(other->values_);
 }
 
 void RegistryDict::ReadRegistry(HKEY hive, const base::string16& root) {
   ClearKeys();
@@ skipping 36 matching lines @@
     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());
     subdict->ReadRegistry(hive, root + L"\\" + it.Name());
-    SetKey(name, subdict.Pass());
+    SetKey(name, std::move(subdict));
   }
 }
 
 scoped_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());
       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 =
             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 =
             entry->second->ConvertToJSON(subschema);
         if (converted)
           result->SetWithoutPathExpansion(entry->first, converted.release());
       }
-      return result.Pass();
+      return std::move(result);
     }
     case base::Value::TYPE_LIST: {
       scoped_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);
           if (converted)
             result->Append(converted.release());
           continue;
         }
         const base::Value* value = GetValue(name);
         if (value) {
           scoped_ptr<base::Value> converted = ConvertValue(*value, item_schema);
           if (converted)
             result->Append(converted.release());
           continue;
         }
         break;
       }
-      return result.Pass();
+      return std::move(result);
     }
     default:
       LOG(WARNING) << "Can't convert registry key to schema type " << type;
   }
 
   return nullptr;
 }
 
 }  // namespace policy