Make sure Chrome_elf.dll imports are correct and that it the first import of chrome.exe

chrome/chrome_exe.gypi

Index: chrome/chrome_exe.gypi
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 6ba4bd3dc026237be1b78d9f5526b45a644ac8d2..2d04bff9b668080bff09837df78d5b28f3ecee0b 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -6,7 +6,42 @@
   'targets': [
     {
       'target_name': 'chrome',
+      'type': 'none',
+      'dependencies': [ 'chrome_initial', ],
+      'conditions': [
+        ['OS == "win"', {
+          'actions': [
+            {
+              'variables': {
+                'reorder_py_path': '<(DEPTH)/build/win/reorder-imports.py',
+                'exe_input_path':'$(OutDir)\\initial',
+                'exe_output_path':'<(PRODUCT_DIR)',
+              },
+              'action_name': 'reorder_imports',
+              'inputs': [
+                '<(reorder_py_path)',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)\\chrome.exe',
+                '<(PRODUCT_DIR)\\chrome.exe.pdb',
+              ],
+              'action': [
+                'python',
+                '<(reorder_py_path)',
+                '-i', '<(exe_input_path)',
+                '-o', '<(exe_output_path)',
+              ],
+              'message': 'Reordering Imports',
+            },
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'chrome_initial',
       'type': 'executable',
+      # Name the exe chrome.exe, not chrome_initial.exe.
+      'product_name': 'chrome',
       'mac_bundle': 1,
       'variables': {
         'use_system_xdg_utils%': 0,
@@ -468,8 +503,6 @@
         }],
         ['OS=="win"', {
           'dependencies': [
-            # Note that chrome_elf must be listed first. Do not reorder it.
-            '../chrome_elf/chrome_elf.gyp:chrome_elf',
             'chrome_dll',
             'chrome_nacl_win64',
             'chrome_process_finder',
@@ -481,6 +514,7 @@
             '../breakpad/breakpad.gyp:breakpad_sender',
             '../components/components.gyp:breakpad_component',
             '../components/components.gyp:policy',
+            '../chrome_elf/chrome_elf.gyp:chrome_elf',
             '../sandbox/sandbox.gyp:sandbox',
           ],
           'sources': [
@@ -494,6 +528,7 @@
           'msvs_settings': {
             'VCLinkerTool': {
               'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib',
+              'OutputFile': '$(OutDir)\\initial\\chrome.exe',
               'DelayLoadDLLs': [
                 'dbghelp.dll',
                 'dwmapi.dll',