Remove raw base::DictionaryValue::Set

third_party/dom_distiller_js/protoc_plugins/json_values_converter.py

 #!/usr/bin/env python
 # Copyright 2016 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.
 
 """protoc plugin to create C++ reader/writer for JSON-encoded protobufs
 
 The reader/writer use Chrome's base::Values.
 """
 
@@ skipping 14 matching lines @@
 
     self.Output('#include "{output_dir}{generated_pb_h}"',
                 output_dir=output_dir + '/' if output_dir else '',
                 generated_pb_h=proto_file.CppBaseHeader())
     self.Output('')
 
     # import is not supported
     assert [] == proto_file.GetDependencies()
 
     self.Output('// base dependencies')
+    self.Output('#include "base/memory/ptr_util.h"')
     self.Output('#include "base/values.h"')
     self.Output('')
     self.Output('#include <memory>')
     self.Output('#include <string>')
     self.Output('#include <utility>')
     self.Output('')
 
     namespaces = proto_file.ProtoNamespaces() + ['json']
     for name in namespaces:
       self.Output('namespace {name} {{', name=name)
@@ skipping 64 matching lines @@
     with self.AddIndent():
       if field.IsRepeated():
         self.RepeatedMemberFieldWriteToValue(field)
       else:
         self.OptionalMemberFieldWriteToValue(field)
 
     self.Output('}}')
 
   def RepeatedMemberFieldWriteToValue(self, field):
     prologue = (
-        'base::ListValue* field_list = new base::ListValue();\n'
-        'dict->Set("{field_number}", field_list);\n'
+        'auto field_list = base::MakeUnique<base::ListValue>();\n'
         'for (int i = 0; i < message.{field_name}_size(); ++i) {{\n'
     )
 
     if field.IsClassType():
       middle = (
           'std::unique_ptr<base::Value> inner_message_value = \n'
           '    {inner_class_converter}::WriteToValue(message.{field_name}(i));\n'
           'field_list->Append(std::move(inner_message_value));\n'
       )
     else:
       middle = (
           'field_list->Append{value_type}(message.{field_name}(i));\n'
       )
+
+    epilogue = (
+        '\n}}\n'
+        'dict->Set("{field_number}", std::move(field_list));'
+    )
     self.Output(
-        prologue + Indented(middle) + '\n}}',
+        prologue + Indented(middle) + epilogue,
         field_number=field.JavascriptIndex(),
         field_name=field.name,
         value_type=field.CppValueType() if not field.IsClassType() else None,
         inner_class_converter=field.CppConverterType()
     )
 
   def OptionalMemberFieldWriteToValue(self, field):
     if field.IsClassType():
       body = (
           'std::unique_ptr<base::Value> inner_message_value = \n'
@@ skipping 129 matching lines @@
 
     response.AddFileWithContent(converter_filename, cppwriter.GetValue())
     if cppwriter.GetErrors():
       response.AddError('\n'.join(cppwriter.GetErrors()))
 
   response.WriteToStdout()
 
 
 if __name__ == '__main__':
   main()