Remove SetWithoutPathExpansion

components/policy/core/common/registry_dict.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.h"
 
 #include <utility>
 
 #include "base/json/json_reader.h"
 #include "base/memory/ptr_util.h"
@@ skipping 36 matching lines @@
     const base::DictionaryValue* dict = nullptr;
     const base::ListValue* list = nullptr;
     if (value.GetAsDictionary(&dict)) {
       std::unique_ptr<base::DictionaryValue> result(
           new base::DictionaryValue());
       for (base::DictionaryValue::Iterator entry(*dict); !entry.IsAtEnd();
            entry.Advance()) {
         std::unique_ptr<base::Value> converted =
             ConvertValue(entry.value(), schema.GetProperty(entry.key()));
         if (converted)
-          result->SetWithoutPathExpansion(entry.key(), converted.release());
+          result->SetWithoutPathExpansion(entry.key(), std::move(converted));
       }
       return std::move(result);
     } else if (value.GetAsList(&list)) {
       std::unique_ptr<base::ListValue> result(new base::ListValue());
       for (base::ListValue::const_iterator entry(list->begin());
            entry != list->end(); ++entry) {
         std::unique_ptr<base::Value> converted =
             ConvertValue(*entry, schema.GetItems());
         if (converted)
           result->Append(std::move(converted));
@@ skipping 240 matching lines @@
     case base::Value::Type::DICTIONARY: {
       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();
         std::unique_ptr<base::Value> converted =
             ConvertValue(*entry->second, subschema);
         if (converted)
-          result->SetWithoutPathExpansion(entry->first, converted.release());
+          result->SetWithoutPathExpansion(entry->first, std::move(converted));
       }
       for (RegistryDict::KeyMap::const_iterator entry(keys_.begin());
            entry != keys_.end(); ++entry) {
         Schema subschema =
             schema.valid() ? schema.GetProperty(entry->first) : Schema();
         std::unique_ptr<base::Value> converted =
             entry->second->ConvertToJSON(subschema);
         if (converted)
-          result->SetWithoutPathExpansion(entry->first, converted.release());
+          result->SetWithoutPathExpansion(entry->first, std::move(converted));
       }
       return std::move(result);
     }
     case base::Value::Type::LIST: {
       std::unique_ptr<base::ListValue> result(new base::ListValue());
       Schema item_schema = schema.valid() ? schema.GetItems() : Schema();
       for (RegistryDict::KeyMap::const_iterator entry(keys_.begin());
            entry != keys_.end(); ++entry) {
         if (!IsKeyNumerical(entry->first))
           continue;
@@ skipping 14 matching lines @@
       return std::move(result);
     }
     default:
       LOG(WARNING) << "Can't convert registry key to schema type " << type;
   }
 
   return nullptr;
 }
 #endif  // #if defined(OS_WIN)
 }  // namespace policy