Generate all extension schema namespaces as "api" and instead vary the generated bundle names.

build/json_schema_api.gni

 # Copyright 2014 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.
 
 # Defines a static library corresponding to the output of schema compiler tools
 # over a set of extensions API schemas (IDL or JSON format.) The library target
 # has implicit hard dependencies on all schema files listed by the invoker and
 # is itself a hard dependency.
 #
 # Invocations of this template may use the following variables:
@@ skipping 13 matching lines @@
 #
 # schemas [optional, default = false]
 #   Boolean indicating if the schema files should be generated.
 #
 # bundle [optional, default = false]
 #   Boolean indicating if the schema bundle files should be generated.
 #
 # bundle_registration [optional, default = false]
 #   Boolean indicating if the API registration bundle files should be generated.
 #
+# bundle_name [required if bundle or bundle_registrations]:
+#     A string to prepend to generated bundle class names, so that multiple
+#     bundle rules can be used without conflicting.  Only used with one of
+#     the cpp-bundle generators.
+#
 # impl_dir [required if bundle_registration = true, otherwise unused]
 #   The path containing C++ implementations of API functions. This path is
 #   used as the root path when looking for {schema}/{schema}_api.h headers
 #   when generating API registration bundles. Such headers, if found, are
 #   automatically included by the generated code.
 #
 # uncompiled_sources [optional, only used when bundle = true or
 #     bundle_registration = true]
 #   A list of schema files which should not be compiled, but which should still
 #   be processed for API bundle generation.
@@ skipping 35 matching lines @@
   }
 
   root_namespace = invoker.root_namespace
 
   compiler_root = "//tools/json_schema_compiler"
   compiler_script = "$compiler_root/compiler.py"
   compiler_sources = [
     "$compiler_root/cc_generator.py",
     "$compiler_root/code.py",
     "$compiler_root/compiler.py",
+    "$compiler_root/cpp_bundle_generator.py",
     "$compiler_root/cpp_generator.py",
     "$compiler_root/cpp_type_generator.py",
     "$compiler_root/cpp_util.py",
     "$compiler_root/h_generator.py",
     "$compiler_root/idl_schema.py",
     "$compiler_root/model.py",
     "$compiler_root/util_cc_helper.py",
   ]
 
   if (schemas) {
@@ skipping 16 matching lines @@
       ]
 
       if (defined(invoker.visibility)) {
         # If visibility is restricted, add our own target to it.
         visibility = invoker.visibility + target_visibility
       }
     }
   }
 
   if (bundle) {
+    assert(defined(invoker.bundle_name),
+           "\"bundle_name\" must be defined for bundles")
+
     uncompiled_sources = []
     if (defined(invoker.uncompiled_sources)) {
       uncompiled_sources = invoker.uncompiled_sources
     }
 
     bundle_generator_schema_name = target_name + "_bundle_generator_schema"
     action(bundle_generator_schema_name) {
       script = compiler_script
       inputs = compiler_sources + invoker.sources + uncompiled_sources
       outputs = [
         "$target_gen_dir/generated_schemas.cc",
         "$target_gen_dir/generated_schemas.h",
       ]
       args = [
                "--root=" + rebase_path("//", root_build_dir),
                "--destdir=" + rebase_path(root_gen_dir, root_build_dir),
                "--namespace=$root_namespace",
+               "--bundle-name=" + invoker.bundle_name,
                "--generator=cpp-bundle-schema",
                "--include-rules=$schema_include_rules",
              ] + rebase_path(invoker.sources, root_build_dir) +
              rebase_path(uncompiled_sources, root_build_dir)
     }
   }
 
   if (bundle_registration) {
+    assert(defined(invoker.bundle_name),
+           "\"bundle_name\" must be defined for bundle registrations")
+
     uncompiled_sources = []
     if (defined(invoker.uncompiled_sources)) {
       uncompiled_sources = invoker.uncompiled_sources
     }
 
     assert(defined(invoker.impl_dir),
            "\"impl_dir\" must be defined for the $target_name template.")
 
     # Child directory inside the generated file tree.
     gen_child_dir = rebase_path(invoker.impl_dir, "//")
 
     bundle_generator_registration_name =
         target_name + "_bundle_generator_registration"
     action(bundle_generator_registration_name) {
       script = compiler_script
       inputs = compiler_sources + invoker.sources + uncompiled_sources
       outputs = [
         "$root_gen_dir/$gen_child_dir/generated_api_registration.cc",
         "$root_gen_dir/$gen_child_dir/generated_api_registration.h",
       ]
       args = [
                "--root=" + rebase_path("//", root_build_dir),
                "--destdir=" + rebase_path(root_gen_dir, root_build_dir),
                "--namespace=$root_namespace",
+               "--bundle-name=" + invoker.bundle_name,
                "--generator=cpp-bundle-registration",
                "--impl-dir=$gen_child_dir",
                "--include-rules=$schema_include_rules",
              ] + rebase_path(invoker.sources, root_build_dir) +
              rebase_path(uncompiled_sources, root_build_dir)
     }
   }
 
   # Compute the contents of the library/source set.
   lib_sources = invoker.sources
@@ skipping 49 matching lines @@
 
       if (defined(invoker.visibility)) {
         visibility = invoker.visibility
       }
       if (defined(invoker.output_name)) {
         output_name = invoker.output_name
       }
     }
   }
 }