[Extension API Extern Generation] Fix array, choices specification

tools/json_schema_compiler/js_externs_generator.py

 # Copyright 2015 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.
 """
 Generator that produces an externs file for the Closure Compiler.
 Note: This is a work in progress, and generated externs may require tweaking.
 
 See https://developers.google.com/closure/compiler/docs/api-tutorial3#externs
 """
 
@@ skipping 162 matching lines @@
     c.Append(' */')
     return c
 
   def _TypeToJsType(self, js_type):
     """Converts a model.Type to a JS type (number, Array, etc.)"""
     if js_type.property_type in (PropertyType.INTEGER, PropertyType.DOUBLE):
       return 'number'
     elif js_type.property_type is PropertyType.OBJECT:
       return 'Object'
     elif js_type.property_type is PropertyType.ARRAY:
-      return 'Array'
+      return '!Array<%s>' % self._TypeToJsType(js_type.item_type)
     elif js_type.property_type is PropertyType.REF:
       ref_type = js_type.ref_type
       # Enums are defined as chrome.fooAPI.MyEnum, but types are defined simply
       # as MyType.
       if self._namespace.types[ref_type].property_type is PropertyType.ENUM:
-        ref_type = 'chrome.%s.%s' % (self._namespace.name, ref_type)
+        ref_type = '!chrome.%s.%s' % (self._namespace.name, ref_type)
       return ref_type
+    elif js_type.property_type is PropertyType.CHOICES:
+      return '(%s)' % '|'.join(
+          [self._TypeToJsType(choice) for choice in js_type.choices])
+    elif js_type.property_type is PropertyType.ANY:
+      return '*'
     elif js_type.property_type.is_fundamental:
       return js_type.property_type.name
     else:
       return '?' # TODO(tbreisacher): Make this more specific.
 
   def _GenerateFunction(self, function):
     """Generates the code representing a function, including its documentation.
        For example:
 
        /**
@@ skipping 36 matching lines @@
  * @const
  */""")
       .Append('chrome.%s = {};' % self._namespace.name))
     return c
 
   def _GenerateFunctionParams(self, function):
     params = function.params[:]
     if function.callback:
       params.append(function.callback)
     return ', '.join(param.name for param in params)