[Extensions] Support choices in autogenerated movable types

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 215 matching lines @@
       elif t.property_type == PropertyType.FUNCTION:
         dicts.append(prop.unix_name)
       elif (real_t.property_type == PropertyType.ENUM or
             t.property_type == PropertyType.INTEGER or
             t.property_type == PropertyType.DOUBLE or
             t.property_type == PropertyType.BOOLEAN):
         props.append(copy_str % (prop.unix_name, prop.unix_name))
       else:
         raise TypeError(t)
 
+    if type_.property_type == PropertyType.CHOICES:
+      for choice in type_.choices:
+        prop_name = 'as_%s' % choice.unix_name
+        props.append(move_str % (prop_name, prop_name))
+
     if (type_.property_type == PropertyType.OBJECT and
         type_.additional_properties is not None):
       if type_.additional_properties.property_type == PropertyType.ANY:
         dicts.append('additional_properties')
       else:
         props.append(move_str % ('additional_properties',
                                  'additional_properties'))
 
     return (props, dicts)
 
@@ skipping 910 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)