[Extensions] Convert APIs to use movable types [11]

tools/json_schema_compiler/util.h

 // Copyright (c) 2012 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.
 
 #ifndef TOOLS_JSON_SCHEMA_COMPILER_UTIL_H__
 #define TOOLS_JSON_SCHEMA_COMPILER_UTIL_H__
 
 #include <string>
 #include <vector>
 
@@ skipping 68 matching lines @@
   const base::DictionaryValue* dict = nullptr;
   if (!from.GetAsDictionary(&dict))
     return false;
   scoped_ptr<T> obj(new T());
   if (!T::Populate(*dict, obj.get(), error))
     return false;
   *out = linked_ptr<T>(obj.release());
   return true;
 }
 
+// This template is used for types generated by tools/json_schema_compiler with
+// error generation enabled.
+template <class T>
+bool PopulateItem(const base::Value& from, T* out, base::string16* error) {
+  const base::DictionaryValue* dict = nullptr;
+  if (!from.GetAsDictionary(&dict))
+    return false;
+  T obj;
+  if (!T::Populate(*dict, &obj, error))
+    return false;
+  *out = std::move(obj);
+  return true;
+}
+
 // Populates |out| with |list|. Returns false if there is no list at the
 // specified key or if the list has anything other than |T|.
 template <class T>
 bool PopulateArrayFromList(const base::ListValue& list, std::vector<T>* out) {
   out->clear();
   T item;
   for (const base::Value* value : list) {
     if (!PopulateItem(*value, &item))
       return false;
     // T might not be movable, but in that case it should be copyable, and this
     // will still work.
     out->push_back(std::move(item));
   }
 
   return true;
 }
 
 // Populates |out| with |list|. Returns false and sets |error| if there is no
 // list at the specified key or if the list has anything other than |T|.
 template <class T>
 bool PopulateArrayFromList(const base::ListValue& list,
                            std::vector<T>* out,
                            base::string16* error) {
   out->clear();
   T item;
   for (const base::Value* value : list) {
     if (!PopulateItem(*value, &item, error))
       return false;
-    out->push_back(item);
+    out->push_back(std::move(item));
   }
 
   return true;
 }
 
 // Creates a new vector containing |list| at |out|. Returns
 // true on success or if there is nothing at the specified key. Returns false
 // if anything other than a list of |T| is at the specified key.
 template <class T>
 bool PopulateOptionalArrayFromList(const base::ListValue& list,
@@ skipping 73 matching lines @@
     return CreateValueFromArray(*from);
   return scoped_ptr<base::Value>();
 }
 
 std::string ValueTypeToString(base::Value::Type type);
 
 }  // namespace util
 }  // namespace json_schema_compiler
 
 #endif  // TOOLS_JSON_SCHEMA_COMPILER_UTIL_H__