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

chrome/chrome_dll.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.
 {
   'conditions': [
     ['OS=="mac" or OS=="win"', {
       'targets': [
         {
           'target_name': 'chrome_dll',
           'type': 'none',
@@ skipping 51 matching lines @@
                 'chrome_version_resources',
                 '../content/content.gyp:content_worker',
                 '../crypto/crypto.gyp:crypto',
                 '../printing/printing.gyp:printing',
                 '../net/net.gyp:net_resources',
                 '../third_party/cld/cld.gyp:cld',
                 '../ui/views/views.gyp:views',
                 '../webkit/support/webkit_support.gyp:webkit_resources',
               ],
               'sources': [
-                'app/chrome.manifest',
                 'app/chrome_command_ids.h',
                 'app/chrome_dll.rc',
                 'app/chrome_dll_resource.h',
                 'app/chrome_main.cc',
                 'app/chrome_main_delegate.cc',
                 'app/chrome_main_delegate.h',
 
                 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc',
                 '../base/win/dllmain.cc',
 
@@ skipping 69 matching lines @@
                     'setupapi.dll',
                     'urlmon.dll',
                     'winhttp.dll',
                     'wininet.dll',
                     'winspool.drv',
                     'ws2_32.dll',
                     'wsock32.dll',
                   ],
                 },
                 'VCManifestTool': {
-                  'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.manifest',
+                  'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.dll.manifest',
                 },
               },
             }],  # OS=="win"
             ['OS=="mac"', {
               # The main browser executable's name is <(mac_product_name).
               # Certain things will get confused if two modules in the
               # executable share the same name, so append " Framework" to the
               # product_name used for the framework.  This will result in
               # a name like "Chromium Framework.framework".
               'product_name': '<(mac_product_name) Framework',
@@ skipping 363 matching lines @@
                   ],
                 }],
               ],  # conditions
             }],  # OS=="mac"
           ],  # conditions
         },  # target chrome_dll
       ],  # targets
     }],  # OS=="mac" or OS=="win"
   ],
 }