Change base::Value::ListStorage to std::vector<base::Value>

tools/json_schema_compiler/cc_generator.py

 # 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.
 
 from code import Code
 from model import PropertyType
 import cpp_util
 import schema_util
 import util_cc_helper
 from cpp_namespace_environment import CppNamespaceEnvironment
@@ skipping 928 matching lines @@
     if is_ptr:
       accessor = '->'
       cpp_type = self._type_helper.GetCppType(item_type, is_in_container=True)
       c.Append('%s.reset(new std::vector<%s>);' %
                    (dst_var, cpp_type))
     (c.Sblock('for (const auto& it : *(%s)) {' % src_var)
       .Append('%s tmp;' % self._type_helper.GetCppType(item_type))
       .Concat(self._GenerateStringToEnumConversion(item_type,
                                                    '(it)',
                                                    'tmp',
-                                                   failure_value))
+                                                   failure_value,
+                                                   is_ptr=False))
       .Append('%s%spush_back(tmp);' % (dst_var, accessor))
       .Eblock('}')
     )
     return c
 
   def _GenerateStringToEnumConversion(self,
                                       type_,
                                       src_var,
                                       dst_var,
-                                      failure_value):
+                                      failure_value,
+                                      is_ptr=True):
     """Returns Code that converts a string type in |src_var| to an enum with
     type |type_| in |dst_var|. In the generated code, if |src_var| is not
     a valid enum name then the function will return |failure_value|.
     """
     if type_.property_type != PropertyType.ENUM:
       raise TypeError(type_)
     c = Code()
     enum_as_string = '%s_as_string' % type_.unix_name
     cpp_type_namespace = ''
     if type_.namespace != self._namespace:
       cpp_type_namespace = '%s::' % type_.namespace.unix_name
+    accessor = '->' if is_ptr else '.'
     (c.Append('std::string %s;' % enum_as_string)
-      .Sblock('if (!%s->GetAsString(&%s)) {' % (src_var, enum_as_string))
+      .Sblock('if (!%s%sGetAsString(&%s)) {' % (src_var,

[Devlin, 2017/03/15 15:25:04]

These changes look generally fine, but I'm a little surprised there weren't more
necessary... have you tried rebuilding from scratch* to ensure we regenerate all
the files this affects?  (In an ideal world, this would be done by the deps, and
it largely is... but I think we've seen issues where the rules aren't quite
perfect before.)

*Really, all you need to do is rm -rf the out/debug/gen/extensions/ and
out/debug/gen/chrome/common/extensions/ directories.

[jdoerrie, 2017/03/24 08:54:37]

I was surprised by this as well, but it looks like conditionally changing this
one accessor is all that's necessary. I followed your constructions to clear the
generated code and recompiled without any problems.

+                                                accessor,
+                                                enum_as_string))
       .Concat(self._GenerateError(
         '"\'%%(key)s\': expected string, got " + ' +
         self._util_cc_helper.GetValueTypeString('%%(src_var)s', True)))

[Devlin, 2017/03/15 15:25:04]

We should update this True here to be is_ptr.

[jdoerrie, 2017/03/24 08:54:37]

Done.

       .Append('return %s;' % failure_value)
       .Eblock('}')
       .Append('%s = %sParse%s(%s);' % (dst_var,
                                        cpp_type_namespace,
                                        cpp_util.Classname(type_.name),
                                        enum_as_string))
       .Sblock('if (%s == %s%s) {' % (dst_var,
                                      cpp_type_namespace,
                                      self._type_helper.GetEnumNoneValue(type_)))
       .Concat(self._GenerateError(
@@ skipping 164 matching lines @@
     if self._generate_error_messages:
       params = list(params) + ['base::string16* error']
     return ', '.join(str(p) for p in params)
 
   def _GenerateArgs(self, args):
     """Builds the argument list for a function, given an array of arguments.
     """
     if self._generate_error_messages:
       args = list(args) + ['error']
     return ', '.join(str(a) for a in args)