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

chrome/chrome_exe.gypi

 # Copyright (c) 2012 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.
 
 {
   'targets': [
     {
       'target_name': 'chrome',
       'type': 'executable',
       'mac_bundle': 1,
       'variables': {
         'use_system_xdg_utils%': 0,
         'enable_wexit_time_destructors': 1,
       },
       'sources': [
         'app/breakpad_field_trial_win.cc',
         'app/breakpad_field_trial_win.h',
         'app/breakpad_win.cc',
         'app/breakpad_win.h',
         'app/chrome_exe_main_aura.cc',
         'app/chrome_exe_main_gtk.cc',
         'app/chrome_exe_main_mac.cc',
         'app/chrome_exe_main_win.cc',
         'app/chrome_exe_resource.h',
         'app/client_util.cc',
         'app/client_util.h',
-        'app/additional.manifest',
-        'app/chrome.manifest',
         'app/hard_error_handler_win.cc',
         'app/hard_error_handler_win.h',
         'app/metro_driver_win.cc',
         'app/metro_driver_win.h',
         '../content/app/startup_helper_win.cc',
       ],
       'mac_bundle_resources': [
         'app/app-Info.plist',
       ],
       # TODO(mark): Come up with a fancier way to do this.  It should only
@@ skipping 441 matching lines @@
                 'dbghelp.dll',
                 'dwmapi.dll',
                 'uxtheme.dll',
                 'ole32.dll',
                 'oleaut32.dll',
               ],
               # Set /SUBSYSTEM:WINDOWS for chrome.exe itself.
               'SubSystem': '2',
             },
             'VCManifestTool': {
-              'AdditionalManifestFiles': '$(ProjectDir)\\app\\additional.manifest;$(ProjectDir)\\app\\chrome.manifest',
+              'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.exe.manifest',
             },
           },
           'actions': [
             {
               'action_name': 'first_run',
               'inputs': [
                   'app/FirstRun',
               ],
               'outputs': [
                   '<(PRODUCT_DIR)/First Run',
@@ skipping 89 matching lines @@
               'target_name': 'chrome_nacl_win64',
               'type': 'none',
               'sources': [],
             },
           ],
         }],
       ],
     }],
   ],
 }