Supporting more APIs with json_schema_compiler

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 55 matching lines @@
     api_defs = json.loads(schema_file.read())
 
   for target_namespace in api_defs:
     # 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)
     if not namespace:
       continue
 
-    out_file = cpp_util.CppName(namespace.name).lower() + filename_suffix
+    out_file = namespace.name + filename_suffix
     type_generator = cpp_type_generator.CppTypeGenerator(root_namespace,
                                                          namespace, out_file)
     for referenced_namespace in api_model.namespaces.values():
       type_generator.AddNamespace(referenced_namespace,
-          cpp_util.CppName(referenced_namespace.name).lower() + filename_suffix)
+          cpp_util.Classname(referenced_namespace.name).lower() +
+          filename_suffix)
     cc_generator = cc_generator.CCGenerator(namespace, type_generator)
     cc_code = cc_generator.Generate().Render()
     h_generator = h_generator.HGenerator(namespace, type_generator)
     h_code = h_generator.Generate().Render()
 
     if dest_dir:
       with open(os.path.join(dest_dir, namespace.source_file_dir,
           out_file + '.cc'), 'w') as cc_file:
         cc_file.write(cc_code)
       with open(os.path.join(dest_dir, namespace.source_file_dir,
           out_file + '.h'), 'w') as h_file:
         h_file.write(h_code)
     else:
       print '%s.h' % out_file
       print
       print h_code
       print
       print '%s.cc' % out_file
       print
       print cc_code