Cleanup: Merge several OS==win sections in chrome_exe.gypi.

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': 'none',
       'dependencies': [ 'chrome_initial', ],
@@ skipping 80 matching lines @@
           ],
         }],
         ['order_text_section!=""', {
           'target_conditions' : [
             ['_toolset=="target"', {
               'ldflags': [
                 '-Wl,-section-ordering-file=<(order_text_section)' ],
             }],
           ]
         }],
-        ['OS == "win"', {
-          'sources!': [
-            # We still want the _win entry point for sandbox, etc.
-            'app/chrome_exe_main_aura.cc',
-          ],
-          'dependencies': [
-            '../ui/gfx/gfx.gyp:gfx',
-          ],
-        }],
         ['OS == "android"', {
           # Don't put the 'chrome' target in 'all' on android
           'suppress_wildcard': 1,
         }],
         ['os_posix == 1 and OS != "mac" and OS != "android"', {
           'actions': [
             {
               'action_name': 'manpage',
               'conditions': [
                 [ 'branding == "Chrome"', {
@@ skipping 372 matching lines @@
             'chrome_version_resources',
             'installer_util',
             'image_pre_reader',
             '../base/base.gyp:base',
             '../crypto/crypto.gyp:crypto',
             '../breakpad/breakpad.gyp:breakpad_handler',
             '../breakpad/breakpad.gyp:breakpad_sender',
             '../chrome_elf/chrome_elf.gyp:chrome_elf',
             '../components/components.gyp:crash_component',
             '../sandbox/sandbox.gyp:sandbox',
+            '../ui/gfx/gfx.gyp:gfx',
+            '../win8/metro_driver/metro_driver.gyp:metro_driver',
+            '../win8/delegate_execute/delegate_execute.gyp:*',
           ],
           'sources': [
             'app/chrome_crash_reporter_client.cc',
             'app/chrome_crash_reporter_client.h',
             'app/chrome_exe.rc',
             'common/crash_keys.cc',
             'common/crash_keys.h',
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc',
           ],
+          'sources!': [
+            # We still want the _win entry point for sandbox, etc.
+            'app/chrome_exe_main_aura.cc',
+          ],
           'msvs_settings': {
             'VCLinkerTool': {
               'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib',
               'OutputFile': '$(OutDir)\\initialexe\\chrome.exe',
               'DelayLoadDLLs': [
                 'dbghelp.dll',
                 'dwmapi.dll',
                 'uxtheme.dll',
                 'ole32.dll',
                 'oleaut32.dll',
@@ skipping 50 matching lines @@
             },
           ],
         }, {  # 'OS!="win"
           'sources!': [
             'app/client_util.cc',
           ],
         }],
         ['OS=="win" and component=="shared_library"', {
           'defines': ['COMPILE_CONTENT_STATICALLY'],
         }],
-        ['OS=="win"', {
-          'dependencies': [
-            '../win8/metro_driver/metro_driver.gyp:metro_driver',
-            '../win8/delegate_execute/delegate_execute.gyp:*',
-          ],
-        }],
       ],
     },
   ],
   'conditions': [
     ['OS=="win"', {
       'targets': [
         {
           'target_name': 'image_pre_reader',
           'type': 'static_library',
           'sources': [
@@ skipping 97 matching lines @@
               'dependencies': [
                 'chrome_nacl_win64',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }