Run the JSON Schema Compiler's bundle compilation on JSON files. Previously it

was only run on IDL files. Clean up all the code which that simplifies.

TBR=isherman@chromium.org,battre@chromium.org,akalin@chromium.org
BUG=141318

Review URL: https://chromiumcodereview.appspot.com/11747025

git-svn-id: http://src.chromium.org/svn/trunk/src/build@176015 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

json_schema_bundle_compile.gypi

@@ -5,7 +5,7 @@
 {
   'variables': {
     # When including this gypi, the following variables must be set:
-    #   idl_schema_files: an array of idl files that comprise the api model.
+    #   schema_files: an array of json or idl files that comprise the api model.
     #   cc_dir: path to generated files
     #   root_namespace: the C++ namespace that all generated files go under
     # Functions and namespaces can be excluded by setting "nocompile" to true.
@@ -27,7 +27,7 @@
         '<(api_gen_dir)/model.py',
         '<(api_gen_dir)/schema_bundle_generator.py',
         '<(api_gen_dir)/util_cc_helper.py',
-        '<@(idl_schema_files)',
+        '<@(schema_files)',
       ],
       'outputs': [
         '<(SHARED_INTERMEDIATE_DIR)/<(cc_dir)/generated_api.h',
@@ -41,7 +41,7 @@
         '--destdir=<(SHARED_INTERMEDIATE_DIR)',
         '--namespace=<(root_namespace)',
         '--bundle',
-        '<@(idl_schema_files)',
+        '<@(schema_files)',
       ],
       'message': 'Generating C++ API bundle code',
       'process_outputs_as_sources': 1,

json_schema_compile.gypi

@@ -5,8 +5,7 @@
 {
   'variables': {
     # When including this gypi, the following variables must be set:
-    #   json_schema_files: a list of json files that comprise the api model.
-    #   idl_schema_files: a list of IDL files that comprise the api model.
+    #   schema_files: a list of json or IDL files that comprise the api model.
     #   cc_dir: path to generated files
     #   root_namespace: the C++ namespace that all generated files go under
     # Functions and namespaces can be excluded by setting "nocompile" to true.