Revert revision 176015

tools/json_schema_compiler/compiler.py

 #!/usr/bin/env python
 # 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.
 """Generator for C++ structs from api json files.
 
 The purpose of this tool is to remove the need for hand-written code that
 converts to and from base::Value types when receiving javascript api calls.
 Originally written for generating code for extension apis. Reference schemas
 are in chrome/common/extensions/api.
@@ skipping 51 matching lines @@
         if split_schema[0] != 'api':
           continue
         else:
           referenced_schema = split_schema[1]
 
       referenced_schema_path = os.path.join(
           os.path.dirname(schema), referenced_schema + '.json')
       referenced_api_defs = json_schema.Load(referenced_schema_path)
 
       for namespace in referenced_api_defs:
-        api_model.AddNamespace(
-            namespace,
+        api_model.AddNamespace(namespace,
             os.path.relpath(referenced_schema_path, opts.root))
 
     # Gets the relative path from opts.root to the schema to correctly determine
     # the include path.
     relpath = os.path.relpath(schema, opts.root)
-    namespace = api_model.AddNamespace(target_namespace,
-                                       relpath,
-                                       include_compiler_options=True)
+    namespace = api_model.AddNamespace(target_namespace, relpath)
     if not namespace:
       continue
 
     if short_filename != namespace.unix_name:
       sys.exit("Filename %s is illegal. Name files using unix_hacker style." %
                filename)
 
     # The output filename must match the input filename for gyp to deal with it
     # properly.
     out_file = namespace.unix_name
@@ skipping 34 matching lines @@
   api_defs = []
   for filename in filenames:
     schema = os.path.normpath(filename)
     schema_filename, schema_extension = os.path.splitext(schema)
     api_defs.extend(load_schema(schema))
 
   api_model = model.Model()
   relpath = os.path.relpath(os.path.normpath(filenames[0]), root)
 
   for target_namespace, schema_filename in zip(api_defs, filenames):
-    namespace = api_model.AddNamespace(target_namespace,
-                                       relpath,
-                                       include_compiler_options=True)
+    namespace = api_model.AddNamespace(target_namespace, relpath)
     path, filename = os.path.split(schema_filename)
     short_filename, extension = os.path.splitext(filename)
 
     # Filenames are checked against the unix_names of the namespaces they
     # generate because the gyp uses the names of the JSON files to generate
     # the names of the .cc and .h files. We want these to be using unix_names.
     if namespace.unix_name != short_filename:
       sys.exit("Filename %s is illegal. Name files using unix_hacker style." %
                schema_filename)
 
@@ skipping 49 matching lines @@
 
   if not args:
     sys.exit(0) # This is OK as a no-op
   dest_dir = opts.destdir
   root_namespace = opts.namespace
 
   if opts.bundle:
     handle_bundle_schema(args, dest_dir, opts.root, root_namespace)
   else:
     handle_single_schema(args[0], dest_dir, opts.root, root_namespace)