Make the JSON Schema compiler handle enums declared in other namespaces.

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 345 matching lines @@
     (c.Sblock('scoped_ptr<base::DictionaryValue> %s::ToValue() const {' %
           cpp_namespace)
         .Append('scoped_ptr<base::DictionaryValue> value('
                     'new base::DictionaryValue());')
         .Append()
     )
 
     for prop in type_.properties.values():
       prop_var = 'this->%s' % prop.unix_name
       if prop.optional:
-        # Optional enum values are generated with a NONE enum value.
         underlying_type = self._type_helper.FollowRef(prop.type_)
         if underlying_type.property_type == PropertyType.ENUM:
-          c.Sblock('if (%s != %s) {' %
+          # Optional enum values are generated with a NONE enum value,
+          # potentially from another namespace.
+          maybe_namespace = ''
+          if underlying_type.namespace != self._namespace:
+            maybe_namespace = '%s::' % underlying_type.namespace.unix_name
+          c.Sblock('if (%s != %s%s) {' %

[Devlin, 2015/04/23 23:26:51]

Honestly, we should probably just fully specify every type, and that would save
us from having to make these changes.  But, of course, that's a pain to do.  So
oh well. :)

[not at google - send to devlin, 2015/04/23 23:28:45]

Hah, yes, that would make things simpler.

               (prop_var,
+               maybe_namespace,
                self._type_helper.GetEnumNoneValue(prop.type_)))
         else:
           c.Sblock('if (%s.get()) {' % prop_var)
 
       # ANY is a base::Value which is abstract and cannot be a direct member, so
       # it will always be a pointer.
       is_ptr = prop.optional or prop.type_.property_type == PropertyType.ANY
       c.Cblock(self._CreateValueFromType(
           'value->SetWithoutPathExpansion("%s", %%s);' % prop.name,
           prop.name,
@@ skipping 682 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)