Call SwapImports on x64 builds too.

chrome_elf/elf_imports_unittest.cc

 // Copyright 2014 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.
 
 #include <stdint.h>
 #include <windows.h>
 
 #include <algorithm>
 #include <vector>
 
@@ skipping 61 matching lines @@
   for (; it != elf_imports.end(); it++) {
     bool match = false;
     for (int i = 0; i < arraysize(kValidFilePatterns); ++i) {
       if (MatchPattern(*it, kValidFilePatterns[i]))
         match = true;
     }
     ASSERT_TRUE(match) << "Illegal import in chrome_elf.dll.";
   }
 }
 
-#if defined(ARCH_CPU_64_BITS)
-#define MAYBE_ChromeExeSanityCheck DISABLED_ChromeExeSanityCheck
-#else
-#define MAYBE_ChromeExeSanityCheck ChromeExeSanityCheck
-#endif
-// Fails on 64-bit Windows, see http://crbug.com/335173.
-TEST_F(ELFImportsTest, MAYBE_ChromeExeSanityCheck) {
+TEST_F(ELFImportsTest, ChromeExeSanityCheck) {
   std::vector<std::string> exe_imports;
 
   base::FilePath exe;
   ASSERT_TRUE(PathService::Get(base::DIR_EXE, &exe));
   exe = exe.Append(L"chrome.exe");
   GetImports(exe, &exe_imports);
 
   // Check that chrome.exe has imports.
   ASSERT_LT(0u, exe_imports.size()) << "Ensure the chrome_elf_unittests "
     "target was built, instead of chrome_elf_unittests.exe";
 
   // Chrome.exe's first import must be ELF.
   EXPECT_EQ("chrome_elf.dll", exe_imports[0]) <<
       "Illegal import order in chrome.exe (ensure the chrome_elf_unittest "
       "target was built, instead of just chrome_elf_unittests.exe)";
 }
 
 }  // namespace