JSON Schema Compiler: Following r267534, properly convert arrays of enums

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
 
@@ skipping 482 matching lines @@
     elif underlying_type.property_type == PropertyType.ENUM:
       return 'new base::StringValue(ToString(%s))' % var
     elif underlying_type.property_type == PropertyType.BINARY:
       if is_ptr:
         vardot = var + '->'
       else:
         vardot = var + '.'
       return ('base::BinaryValue::CreateWithCopiedBuffer(%sdata(), %ssize())' %
               (vardot, vardot))
     elif underlying_type.property_type == PropertyType.ARRAY:
+      item_type = underlying_type.item_type
+      # Any enum will only have a namespace if it's not a ref, hence the lack
+      # of FollowRef(item_type) here and just directly comparing to ENUM.
+      enum_namespace = None
+      if item_type.property_type == PropertyType.ENUM:
+        enum_namespace = cpp_namespace
       return '%s.release()' % self._util_cc_helper.CreateValueFromArray(
-          cpp_namespace,
-          underlying_type,
           var,
-          is_ptr)
+          optional=is_ptr,
+          is_enum=self._type_helper.FollowRef(item_type).property_type ==
+                  PropertyType.ENUM,
+          enum_namespace=enum_namespace)
     elif underlying_type.property_type.is_fundamental:
       if is_ptr:
         var = '*%s' % var
       if underlying_type.property_type == PropertyType.STRING:
         return 'new base::StringValue(%s)' % var
       else:
         return 'new base::FundamentalValue(%s)' % var
     else:
       raise NotImplementedError('Conversion of %s to base::Value not '
                                 'implemented' % repr(type_.type_))
@@ skipping 487 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)