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

tools/json_schema_compiler/util_cc_helper.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 model import PropertyType
 
 
 _API_UTIL_NAMESPACE = 'json_schema_compiler::util'
 
 
@@ skipping 37 matching lines @@
     if optional:
       val = '%(namespace)s::PopulateOptionalArrayFromList(*%(src)s, &%(dst)s)'
     else:
       val = '%(namespace)s::PopulateArrayFromList(*%(src)s, &%(dst)s)'
     return val % {
       'namespace': _API_UTIL_NAMESPACE,
       'src': src,
       'dst': dst
     }
 
-  def CreateValueFromArray(self, cpp_namespace, type_, src, optional):
+  def CreateValueFromArray(self,
+                           src,
+                           optional=False,
+                           is_enum=False,
+                           enum_namespace=None):
     """Generates code to create a scoped_pt<Value> from the array at src.
 
-    |cpp_namespace| The namespace which contains |type_|. This is needed for
-        enum conversions, where the ToString method is on the containing
+    |enum_namespace| The namespace which contains |item_type|. This is needed
+        for enum conversions, where the ToString method is on the containing
         namespace.
-    |type_| The type of the values being converted. This is needed for enum
-        conversions, to know whether to use the Enum form of conversion.
+    |item_type| The type of each array item of the values being converted.
+        This is needed for enum conversions, to know whether to use the Enum
+        form of conversion.
     |src| The variable to convert, either a vector or scoped_ptr<vector>.
-    |optional| Whether |type_| was optional. Optional types are pointers so
-        must be treated differently.
+    |optional| Whether the whole array was optional. Optional types are
+        pointers so must be treated differently.
+    |is_enum| Whether the values are enums. Enums are treated specially because
+        they need their ToString() values called, not an integer.
+    |enum_namespace| The namespace of the enum being converted, if any.
+        The enum might not necessarily have a namespace.
     """
-    if type_.item_type.property_type == PropertyType.ENUM:
+    if is_enum:
       # Enums are treated specially because C++ templating thinks that they're
       # ints, but really they're strings.
       if optional:
-        name = 'CreateValueFromOptionalEnumArray<%s>' % cpp_namespace
+        name = 'CreateValueFromOptionalEnumArray'
       else:
-        name = 'CreateValueFromEnumArray<%s>' % cpp_namespace
+        name = 'CreateValueFromEnumArray'
+      if enum_namespace:
+        name += '<%s>' % enum_namespace
+      else:
+        name += 'WithoutNamespace'
     else:
       if optional:
         name = 'CreateValueFromOptionalArray'
       else:
         name = 'CreateValueFromArray'
     return '%s::%s(%s)' % (_API_UTIL_NAMESPACE, name, src)
 
   def GetIncludePath(self):
     return '#include "tools/json_schema_compiler/util.h"'
 
   def GetValueTypeString(self, value, is_ptr=False):
     call = '.GetType()'
     if is_ptr:
       call = '->GetType()'
     return 'json_schema_compiler::util::ValueTypeToString(%s%s)' % (value, call)