Revert 153268 - Refactor manifests to allow all executables to use the same base manifests as Addit…

chrome/chrome_installer.gypi

Index: chrome/chrome_installer.gypi
===================================================================
--- chrome/chrome_installer.gypi	(revision 153388)
+++ chrome/chrome_installer.gypi	(working copy)
@@ -86,7 +86,6 @@
             '..',
           ],
           'sources': [
-            'app/additional.manifest',
             'installer/setup/compat_checks_unittest.cc',
             'installer/setup/setup_constants.cc',
             'installer/util/channel_info_unittest.cc',
@@ -130,7 +129,7 @@
           ],
           'msvs_settings': {
             'VCManifestTool': {
-              'AdditionalManifestFiles': '$(ProjectDir)\\app\\additional.manifest',
+              'AdditionalManifestFiles': '$(ProjectDir)\\installer\\mini_installer\\mini_installer.exe.manifest',
             },
           },
         },
@@ -235,7 +234,6 @@
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc',
-            'app/additional.manifest',
             'installer/util/installation_validation_helper.cc',
             'installer/util/installation_validation_helper.h',
             'test/mini_installer_test/installer_path_provider.cc',
@@ -251,7 +249,7 @@
           ],
           'msvs_settings': {
             'VCManifestTool': {
-              'AdditionalManifestFiles': '$(ProjectDir)\\app\\additional.manifest',
+              'AdditionalManifestFiles': '$(ProjectDir)\\installer\\mini_installer\\mini_installer.exe.manifest',
             },
           },
         },
@@ -281,7 +279,6 @@
             ],
           },
           'sources': [
-            'app/additional.manifest',
             'installer/mini_installer/chrome.release',
             'installer/setup/chrome_frame_quick_enable.cc',
             'installer/setup/chrome_frame_quick_enable.h',
@@ -308,7 +305,7 @@
               'SubSystem': '2',     # Set /SUBSYSTEM:WINDOWS
             },
             'VCManifestTool': {
-              'AdditionalManifestFiles': '$(ProjectDir)\\app\\additional.manifest',
+              'AdditionalManifestFiles': '$(ProjectDir)\\installer\\setup\\setup.exe.manifest',
             },
           },
           'rules': [