Revert 35012 - Rearrange build configurations make it clearer and allow better support for x64 on Windows

TEST=none
BUG=29467

Review URL: http://codereview.chromium.org/501127

TBR=gregoryd@google.com
Review URL: http://codereview.chromium.org/500149

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35016 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 12 insertions, 12 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 6e7639b..da30ab1 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1764,7 +1764,7 @@
                 },
               },
               'configurations': {
-                'Debug_Base': {
+                'Debug': {
                   'msvs_settings': {
                     'VCLinkerTool': {
                       'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
@@ -2622,7 +2622,7 @@
                 }],
               ],
               'configurations': {
-                'Debug_Base': {
+                'Debug': {
                   'msvs_settings': {
                     'VCLinkerTool': {
                       'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index bf682a5..aad10e6 100755
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -373,7 +373,7 @@
             ],
           },
           'configurations': {
-            'Debug_Base': {
+            'Debug': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
@@ -456,7 +456,7 @@
             ],
           },
           'configurations': {
-            'Debug_Base': {
+            'Debug': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
@@ -998,7 +998,7 @@
             ],
           },
           'configurations': {
-            'Debug_Base': {
+            'Debug': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
@@ -1133,7 +1133,7 @@
             '<(allocator_target)',
           ],
           'configurations': {
-            'Debug_Base': {
+            'Debug': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
@@ -1483,7 +1483,7 @@
             ],
           },
           'configurations': {
-            'Debug_Base': {
+            'Debug': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
@@ -1553,7 +1553,7 @@
             }],
             ['OS=="win"', {
               'configurations': {
-                'Debug_Base': {
+                'Debug': {
                   'msvs_settings': {
                     'VCLinkerTool': {
                       'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
@@ -1664,7 +1664,7 @@
                   '<(allocator_target)',
                 ],
                 'configurations': {
-                  'Debug_Base': {
+                  'Debug': {
                     'msvs_settings': {
                       'VCLinkerTool': {
                         'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
diff --git a/chrome/installer/installer_util.gypi b/chrome/installer/installer_util.gypi
index eeee198..df69383 100644
--- a/chrome/installer/installer_util.gypi
+++ b/chrome/installer/installer_util.gypi
@@ -112,7 +112,7 @@
             '<(SHARED_INTERMEDIATE_DIR)',
           ],
           'configurations': {
-            'Common_Base': {
+            'Common': {
               'msvs_target_platform': 'x64',
             },
           },
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index 1314599..698884d 100755
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -60,7 +60,7 @@
             },
           },
           'configurations': {
-            'Debug_Base': {
+            'Debug': {
               'msvs_settings': {
                 'VCCLCompilerTool': {
                   'BasicRuntimeChecks': '0',
diff --git a/chrome/test/interactive_ui/interactive_ui_tests.gypi b/chrome/test/interactive_ui/interactive_ui_tests.gypi
index efa6be0..983dc27 100644
--- a/chrome/test/interactive_ui/interactive_ui_tests.gypi
+++ b/chrome/test/interactive_ui/interactive_ui_tests.gypi
@@ -135,7 +135,7 @@
         }],
       ],
       'configurations': {
-        'Debug_Base': {
+        'Debug': {
           'msvs_settings': {
             'VCLinkerTool': {
               'LinkIncremental': '<(msvs_large_module_debug_link_mode)',