Link chrome.exe to its IntDir and then hardlink to OutDir

chrome/chrome_exe.gypi

Index: chrome/chrome_exe.gypi
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 69b8a6142bf899ce9062e682383a56bb62dde16c..31a9077d4f5fe13f71a0d2f59f5fad4fb8bf19b5 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -45,19 +45,6 @@
         },
         'conditions': [
           ['OS=="win"', {
-            # TODO(scottbyer): This is a temporary workaround.  The right fix
-            # is to change the output file to be in $(IntDir) for this project
-            # and the .dll project and use the hardlink script to link it back
-            # to $(OutDir).
-            'configurations': {
-              'Debug_Base': {
-                'msvs_settings': {
-                  'VCLinkerTool': {
-                    'LinkIncremental': '1',
-                  },
-                },
-              },
-            },
             'msvs_settings': {
               'VCLinkerTool': {
                 'DelayLoadDLLs': [
@@ -464,6 +451,20 @@
             },
           },
         }],
+
+        # Linking to $(IntDir) and then hard-linking back to $(OutDir) is a
+        # workaround to avoid having the .ilk files for chrome.dll and
+        # chrome.exe conflicting. See http://crbug.com/92528 for background.
+        # Only done on 2008 currently because msvs_postbuild isn't implemented
+        # on 2010 yet, and this hack may not be required there anyway.
+        ['OS=="win" and MSVS_VERSION=="2008"', {
+          'msvs_settings': {
+            'VCLinkerTool': {
+              'OutputFile': '$(IntDir)\\chrome.exe',
+            },
+          },
+          'msvs_postbuild': 'tools\\build\\win\\hardlink_failsafe.bat $(IntDir)\\chrome.exe $(OutDir)\\chrome.exe'
+        }],
       ],
     },
   ],