Remove more usage of the base::ListValue::Append(Value*) overload.

content/browser/devtools/protocol/devtools_protocol_handler_generator.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 import sys
 import string
 import json
 
 blink_protocol_path = sys.argv[1]
 output_cc_path = sys.argv[2]
 output_h_path = sys.argv[3]
 
 header = """\
 // Copyright 2014 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.
 
 // THIS FILE IS AUTOGENERATED. DO NOT EDIT.
 // Generated by
-//  content/public/browser/devtools_protocol_handler_generator.py from
-//  gen/blink/core/inspector/protocol.json and
+//  content/browser/devtools/protocol/devtools_protocol_handler_generator.py
+//  from gen/blink/core/inspector/protocol.json
 """
 
 template_h = string.Template(header + """\
 
 #ifndef CONTENT_BROWSER_DEVTOOLS_PROTOCOL_DEVTOOLS_PROTOCOL_DISPATCHER_H_
 #define CONTENT_BROWSER_DEVTOOLS_PROTOCOL_DEVTOOLS_PROTOCOL_DISPATCHER_H_
 
+#include <memory>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "content/browser/devtools/protocol/devtools_protocol_client.h"
 
 namespace content {
 
 class DevToolsProtocolDispatcher;
 
 namespace devtools {
 
 extern const char kProtocolVersion[];
 
 bool IsSupportedProtocolVersion(const std::string& version);
 
 template<typename T>
-base::Value* CreateValue(const T& param) {
-  return new base::FundamentalValue(param);
+std::unique_ptr<base::Value> CreateValue(const T& param) {
+  return base::MakeUnique<base::FundamentalValue>(param);
+}
+
+template<typename T>
+std::unique_ptr<base::Value> CreateValue(std::unique_ptr<T>& param) {
+  return std::move(param);
 }
 
 template<class T>
-base::Value* CreateValue(std::unique_ptr<T>& param) {
-  return param.release();
-}
-
-template<class T>
-base::Value* CreateValue(scoped_refptr<T> param) {
-  return param->ToValue().release();
+std::unique_ptr<base::Value> CreateValue(const scoped_refptr<T>& param) {
+  return param->ToValue();
 }
 
 template<typename T>
-base::Value* CreateValue(const std::vector<T> param) {
-  base::ListValue* result = new base::ListValue();
+std::unique_ptr<base::Value> CreateValue(const std::vector<T>& param) {
+  std::unique_ptr<base::ListValue> result(new base::ListValue());
   for (auto& item : param) {
     result->Append(CreateValue(item));
   }
-  return result;
+  return std::move(result);
 }
 
 template<>
-base::Value* CreateValue(const std::string& param);
+std::unique_ptr<base::Value> CreateValue(const std::string& param);
 
 ${types}\
 
 }  // namespace devtools
 
 class DevToolsProtocolDispatcher {
  public:
   using CommandHandler =
       base::Callback<bool(DevToolsCommandId,
                           std::unique_ptr<base::DictionaryValue>)>;
@@ skipping 196 matching lines @@
 bool IsSupportedProtocolVersion(const std::string& version) {
   std::vector<base::StringPiece> tokens = base::SplitStringPiece(
       version, ".", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
   int major, minor;
   return tokens.size() == 2 &&
       base::StringToInt(tokens[0], &major) && major == ${major} &&
       base::StringToInt(tokens[1], &minor) && minor <= ${minor};
 }
 
 template<>
-base::Value* CreateValue(const std::string& param) {
-  return new base::StringValue(param);
+std::unique_ptr<base::Value> CreateValue(const std::string& param) {
+  return base::MakeUnique<base::StringValue>(param);
 }
 
 ${types}\
 
 }  // namespace devtools
 
 }  // namespace content
 """)
 
 tmpl_include = string.Template("""\
@@ skipping 496 matching lines @@
 output_h_file.close()
 
 output_cc_file.write(template_cc.substitute({},
     major = blink_protocol["version"]["major"],
     minor = blink_protocol["version"]["minor"],
     includes = "".join(sorted(includes)),
     fields_init = ",\n      ".join(fields_init),
     methods = "\n".join(handler_method_impls),
     types = "\n".join(type_impls)))
 output_cc_file.close()