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

extensions/shell/common/api/api.gyp

Index: extensions/shell/common/api/api.gyp
diff --git a/extensions/shell/common/api/api.gyp b/extensions/shell/common/api/api.gyp
index 3421f05f5f458d59bc3604615615c304ffe00db0..035341065f491b6ef44384d6fcd600dbd8646acd 100644
--- a/extensions/shell/common/api/api.gyp
+++ b/extensions/shell/common/api/api.gyp
@@ -7,12 +7,29 @@
     {
       'target_name': 'shell_api',
       'type': 'static_library',
+      'sources': [
+        '<@(schema_files)',
+      ],
       # TODO(jschuh): http://crbug.com/167187 size_t -> int
       'msvs_disabled_warnings': [ 4267 ],
       'includes': [
         '../../../../build/json_schema_bundle_compile.gypi',
         '../../../../build/json_schema_compile.gypi',
-        'schemas.gypi',
+      ],
+      'variables': {
+        'chromium_code': 1,
+        'non_compiled_schema_files': [
+        ],
+        # TODO(thestig): Eliminate these on Android. See crbug.com/305852.
+        'schema_files': [
+          'shell.idl',
+        ],
+        'cc_dir': 'extensions/shell/common/api',
+        'root_namespace': 'extensions::shell_api::%(namespace)s',
+        'impl_dir': 'extensions/shell/browser/api',
+      },
+      'dependencies': [
+        '<(DEPTH)/skia/skia.gyp:skia',
       ],
     },
   ],