Load application manifests from resources

content/content.gyp

Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index ff15c09592f38bd6cb3e7739f1c876399aa43c7f..783e0b8d1f6dd3c3d730dc8d1df2b48ce3706d98 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -58,33 +58,6 @@
         'public/common/feature_h264_with_openh264_ffmpeg.h',
       ],
     },
-    {
-      # GN version: //content/browser:chrome_manifest
-      'target_name': 'chrome_manifest',
-      'type': 'none',
-      'variables': {
-        'application_type': 'exe',
-        'application_name': 'chrome',
-        'source_manifest': '<(DEPTH)/content/browser/mojo/chrome_manifest.json',
-      },
-      'includes': [
-        '../mojo/public/mojo_application_manifest.gypi',
-      ],
-    },
-    {
-      # GN version: //content/browser:chrome_renderer_manifest
-      'target_name': 'chrome_renderer_manifest',
-      'type': 'none',
-      'variables': {
-        'application_type': 'exe',
-        'application_name': 'chrome_renderer',
-        'source_manifest':
-            '<(DEPTH)/content/browser/mojo/chrome_renderer_manifest.json',
-      },
-      'includes': [
-        '../mojo/public/mojo_application_manifest.gypi',
-      ],
-    },
   ],
   'includes': [
     '../build/win_precompile.gypi',
@@ -210,8 +183,6 @@
             '../build/android/disable_gcc_lto.gypi',
           ],
           'dependencies': [
-            'chrome_manifest',
-            'chrome_renderer_manifest',
             'content_common',
             'content_gpu',
             'content_resources',
@@ -400,6 +371,34 @@
           'export_dependent_settings': ['content'],
         },
         {
+          # GN version: //content/public/app:browser_manifest
+          'target_name': 'content_app_browser_manifest',
+          'type': 'none',
+          'variables': {
+            'application_type': 'exe',
+            'application_name': 'content_browser',
+            'source_manifest': '<(DEPTH)/content/public/app/mojo/content_browser_manifest.json',
+          },
+          'includes': [
+            '../mojo/public/mojo_application_manifest.gypi',
+          ],
+          'hard_dependency': 1,
+        },
+        {
+          # GN version: //content/public/app:renderer_manifest
+          'target_name': 'content_app_renderer_manifest',
+          'type': 'none',
+          'variables': {
+            'application_type': 'exe',
+            'application_name': 'content_renderer',
+            'source_manifest': '<(DEPTH)/content/public/app/mojo/content_renderer_manifest.json',
+          },
+          'includes': [
+            '../mojo/public/mojo_application_manifest.gypi',
+          ],
+          'hard_dependency': 1,
+        },
+        {
           # GN version: //content/browser and //content/public/browser
           'target_name': 'content_browser',
           'type': 'none',
@@ -411,8 +410,6 @@
           'target_name': 'content_common',
           'type': 'none',
           'dependencies': [
-            'chrome_manifest',
-            'chrome_renderer_manifest',
             'content',
             'content_resources'
           ],