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

chrome/chrome_tests.gypi

 # 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' : {
     'browser_tests_sources_views_specific': [
       'browser/extensions/browser_action_test_util_views.cc',
       'browser/views/find_bar_host_browsertest.cc',
     ],
@@ skipping 355 matching lines @@
             '../google_update/google_update.gyp:google_update',
             '../views/views.gyp:views',
             '<(allocator_target)',
           ],
           'link_settings': {
             'libraries': [
               '-lOleAcc.lib',
             ],
           },
           'configurations': {
-            'Debug_Base': {
+            'Debug': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                 },
               },
             },
           },
         }, { # else: OS != "win"
           'sources!': [
             # TODO(port)?  (Most of these include windows.h or similar.)
@@ skipping 62 matching lines @@
             # run time dependency
             '../webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin',
             '<(allocator_target)',
           ],
           'link_settings': {
             'libraries': [
               '-lOleAcc.lib',
             ],
           },
           'configurations': {
-            'Debug_Base': {
+            'Debug': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                 },
               },
             },
           },
         }],
       ],
     },
@@ skipping 521 matching lines @@
           'link_settings': {
             'libraries': [
               '-lcomsupp.lib',
               '-loleacc.lib',
               '-lrpcrt4.lib',
               '-lurlmon.lib',
               '-lwinmm.lib',
             ],
           },
           'configurations': {
-            'Debug_Base': {
+            'Debug': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                 },
               },
             },
           },
         }, { # else: OS != "win"
           'sources!': [
             'browser/bookmarks/bookmark_codec_unittest.cc',
@@ skipping 114 matching lines @@
           ],
           'include_dirs': [
             'third_party/wtl/include',
           ],
           'dependencies': [
             'chrome_dll_version',
             'installer/installer.gyp:installer_util_strings',
             '<(allocator_target)',
           ],
           'configurations': {
-            'Debug_Base': {
+            'Debug': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                 },
               },
             },
           }
         }],
         ['OS=="linux"', {
           'dependencies': [
@@ skipping 329 matching lines @@
             '<(allocator_target)',
           ],
           'link_settings': {
             'libraries': [
               '-lcrypt32.lib',
               '-lws2_32.lib',
               '-lsecur32.lib',
             ],
           },
           'configurations': {
-            'Debug_Base': {
+            'Debug': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                 },
               },
             },
           },
         }, { # else: OS != "win"
           'sources!': [
             'browser/sync/util/data_encryption_unittest.cc',
@@ skipping 49 matching lines @@
                 'browser/visitedlink_perftest.cc',
               ],
             }],
             ['OS=="win" or (OS=="linux" and toolkit_views==1)', {
               'dependencies': [
                 '../views/views.gyp:views',
               ],
             }],
             ['OS=="win"', {
               'configurations': {
-                'Debug_Base': {
+                'Debug': {
                   'msvs_settings': {
                     'VCLinkerTool': {
                       'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                     },
                   },
                 },
               },
               'dependencies': [
                 '<(allocator_target)',
               ],
@@ skipping 90 matching lines @@
                 'include_dirs': [
                   'third_party/wtl/include',
                  ],
                 'dependencies': [
                   'chrome_dll_version',
                   'installer/installer.gyp:installer_util_strings',
                   '../views/views.gyp:views',
                   '<(allocator_target)',
                 ],
                 'configurations': {
-                  'Debug_Base': {
+                  'Debug': {
                     'msvs_settings': {
                       'VCLinkerTool': {
                         'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                       },
                     },
                   },
                 },
               }],
             ],
         },
@@ skipping 144 matching lines @@
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: