summaryrefslogtreecommitdiffstats
path: root/chrome_elf
diff options
context:
space:
mode:
authorcaitkp@chromium.org <caitkp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-08 00:08:18 +0000
committercaitkp@chromium.org <caitkp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-08 00:08:18 +0000
commit58d8c71c27e4f4e832f76ee6332fdcc16b0ed42b (patch)
tree48bab26785b34b647f11b2c4829cc1146895adb6 /chrome_elf
parent434da8755d493d0153ccfbc59f9c50ee7bc21547 (diff)
downloadchromium_src-58d8c71c27e4f4e832f76ee6332fdcc16b0ed42b.zip
chromium_src-58d8c71c27e4f4e832f76ee6332fdcc16b0ed42b.tar.gz
chromium_src-58d8c71c27e4f4e832f76ee6332fdcc16b0ed42b.tar.bz2
Call SwapImports on x64 builds too.
BUG=335173 Review URL: https://codereview.chromium.org/149023008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249859 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_elf')
-rw-r--r--chrome_elf/elf_imports_unittest.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome_elf/elf_imports_unittest.cc b/chrome_elf/elf_imports_unittest.cc
index 5833b1f..c4b9dd4 100644
--- a/chrome_elf/elf_imports_unittest.cc
+++ b/chrome_elf/elf_imports_unittest.cc
@@ -79,13 +79,7 @@ TEST_F(ELFImportsTest, ChromeElfSanityCheck) {
}
}
-#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;