Call SwapImports on x64 builds too.

build/win/reorder-imports.py

Index: build/win/reorder-imports.py
diff --git a/build/win/reorder-imports.py b/build/win/reorder-imports.py
index da0a09a353e9d0872067001b8e6932a4f55ecf18..616ae35fb9153feccb0ef9625dc7020b9a6fdce9 100755
--- a/build/win/reorder-imports.py
+++ b/build/win/reorder-imports.py
@@ -19,16 +19,19 @@ def reorder_imports(input_dir, output_dir, architecture):
   input_image = os.path.join(input_dir, 'chrome.exe')
   output_image = os.path.join(output_dir, 'chrome.exe')
 
-  # TODO(caitkp): Remove this once swapimport works on x64 builds.
+  swap_exe = os.path.join(
+    __file__,
+    '..\\..\\..\\third_party\\syzygy\\binaries\\exe\\swapimport.exe')
+
+  args = [swap_exe, '--input-image=%s' % input_image,
+      '--output-image=%s' % output_image, '--overwrite']
+
   if architecture == 'x64':
-    shutil.copy(input_image, output_image)
-  else:
-    swap_exe = os.path.join(
-        __file__,
-        '..\\..\\..\\third_party\\syzygy\\binaries\\exe\\swapimport.exe')
-    subprocess.call(
-        [swap_exe, '--input-image=%s' % input_image,
-         '--output-image=%s' % output_image, '--overwrite', 'chrome_elf.dll'])
+    args.append('--x64');
+
+  args.append('chrome_elf.dll');
+
+  subprocess.call(args)
 
   for fname in glob.iglob(os.path.join(input_dir, 'chrome.exe.*')):
     shutil.copy(fname, os.path.join(output_dir, os.path.basename(fname)))