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

chrome/chrome_exe.gypi

Index: chrome/chrome_exe.gypi
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 04b76a76e477b38f6ed041eac132939ad83ee58d..93386d4b6a5aaccd5f07692bff32e076443a2271 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -98,15 +98,6 @@
             }],
           ]
         }],
-        ['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,
@@ -499,6 +490,9 @@
             '../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',
@@ -508,6 +502,10 @@
             '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',
@@ -578,12 +576,6 @@
         ['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:*',
-          ],
-        }],
       ],
     },
   ],