Revert "Split bundle generation steps so that API registration is generated in browser, not common."

build/json_schema_bundle_compile.gypi

Index: build/json_schema_bundle_compile.gypi
diff --git a/build/json_schema_bundle_compile.gypi b/build/json_schema_bundle_compile.gypi
index 7560bdcc84dbb05def74afc6f11da1eb8d5d47f0..7e712d7df49e45931305256e7342f98b02d3780e 100644
--- a/build/json_schema_bundle_compile.gypi
+++ b/build/json_schema_bundle_compile.gypi
@@ -19,29 +19,30 @@
     # chrome/browser/extensions/api and can be overridden by setting "impl_dir".
     'api_gen_dir': '<(DEPTH)/tools/json_schema_compiler',
     'api_gen': '<(api_gen_dir)/compiler.py',
-    'generator_files': [
-      '<(api_gen_dir)/cc_generator.py',
-      '<(api_gen_dir)/code.py',
-      '<(api_gen_dir)/compiler.py',
-      '<(api_gen_dir)/cpp_bundle_generator.py',
-      '<(api_gen_dir)/cpp_type_generator.py',
-      '<(api_gen_dir)/cpp_util.py',
-      '<(api_gen_dir)/h_generator.py',
-      '<(api_gen_dir)/idl_schema.py',
-      '<(api_gen_dir)/json_schema.py',
-      '<(api_gen_dir)/model.py',
-      '<(api_gen_dir)/util_cc_helper.py',
-    ],
+    'impl_dir%': 'chrome/browser/extensions/api',
   },
   'actions': [
     {
-      'action_name': 'genapi_bundle_schema',
+      # GN version: //extensions/generated_extensions_api.gni
+      'action_name': 'genapi_bundle',
       'inputs': [
-        '<@(generator_files)',
+        '<(api_gen_dir)/cc_generator.py',
+        '<(api_gen_dir)/code.py',
+        '<(api_gen_dir)/compiler.py',
+        '<(api_gen_dir)/cpp_bundle_generator.py',
+        '<(api_gen_dir)/cpp_type_generator.py',
+        '<(api_gen_dir)/cpp_util.py',
+        '<(api_gen_dir)/h_generator.py',
+        '<(api_gen_dir)/idl_schema.py',
+        '<(api_gen_dir)/json_schema.py',
+        '<(api_gen_dir)/model.py',
+        '<(api_gen_dir)/util_cc_helper.py',
         '<@(schema_files)',
         '<@(non_compiled_schema_files)',
       ],
       'outputs': [
+        '<(SHARED_INTERMEDIATE_DIR)/<(cc_dir)/generated_api.h',
+        '<(SHARED_INTERMEDIATE_DIR)/<(cc_dir)/generated_api.cc',
         '<(SHARED_INTERMEDIATE_DIR)/<(cc_dir)/generated_schemas.h',
         '<(SHARED_INTERMEDIATE_DIR)/<(cc_dir)/generated_schemas.cc',
       ],
@@ -51,15 +52,14 @@
         '--root=<(DEPTH)',
         '--destdir=<(SHARED_INTERMEDIATE_DIR)',
         '--namespace=<(root_namespace)',
-        '--generator=cpp-bundle-schema',
+        '--generator=cpp-bundle',
+        '--impl-dir=<(impl_dir)',
         '<@(schema_files)',
         '<@(non_compiled_schema_files)',
       ],
-      'message': 'Generating C++ API bundle code for schemas',
+      'message': 'Generating C++ API bundle code',
       'process_outputs_as_sources': 1,
-      # Avoid running MIDL compiler on IDL input files.
-      'explicit_idl_action': 1,
-    },
+    }
   ],
   'include_dirs': [
     '<(SHARED_INTERMEDIATE_DIR)',