Revert 35012 - Rearrange build configurations make it clearer and allow bett...

chrome/chrome.gyp

 # Copyright (c) 2009 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'variables': {
       'version_py_path': 'tools/build/version.py',
@@ skipping 1746 matching lines @@
                   'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
                   'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb',
                   # Set /SUBSYSTEM:WINDOWS for chrome.dll (for consistency).
                   'SubSystem': '2',
                 },
                 'VCManifestTool': {
                   'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.dll.manifest',
                 },
               },
               'configurations': {
-                'Debug_Base': {
+                'Debug': {
                   'msvs_settings': {
                     'VCLinkerTool': {
                       'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                     },
                   },
                 },
               },
             }],  # OS=="win"
             ['OS=="mac"', {
               # The main browser executable's name is <(mac_product_name).
@@ skipping 837 matching lines @@
           'conditions': [
             ['OS=="win"', {
               'conditions': [
                 ['win_use_allocator_shim==1', {
                   'dependencies': [
                     '<(allocator_target)',
                   ],
                 }],
               ],
               'configurations': {
-                'Debug_Base': {
+                'Debug': {
                   'msvs_settings': {
                     'VCLinkerTool': {
                       'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                     },
                   },
                 },
               },
             }],
           ],
         },
@@ skipping 87 matching lines @@
       }],  # targets
     }],  # OS=="linux" or OS=="freebsd"
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: