Temporarily disable failing Win64 tests relying on pe_image

64-bit PE files aren't as predictable as 32-bit, so I'll need to modify these tests.
I'm disabling them for now to get the bots on the main waterfall.

R=rvargas@chromium.org,robertshield@chromium.org

BUG=167707
Review URL: https://codereview.chromium.org/12207128

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182078 0039d316-1c4b-4281-b951-d872f2087c98

base/win/pe_image_unittest.cc

@@ -189,9 +189,17 @@ int GetExpectedValue(Value value, DWORD os) {
   return expected[value][expected_set];
 }
 
+
+// TODO(jschuh): crbug.com/167707 Need to fix test on Win64 bots
+#if defined(OS_WIN) && defined(ARCH_CPU_X86_64)
+#define MAYBE_EnumeratesPE DISABLED_EnumeratesPE
+#else
+#define MAYBE_EnumeratesPE EnumeratesPE
+#endif
+
 // Tests that we are able to enumerate stuff from a PE file, and that
 // the actual number of items found is within the expected range.
-TEST(PEImageTest, EnumeratesPE) {
+TEST(PEImageTest, MAYBE_EnumeratesPE) {
   HMODULE module = LoadLibrary(L"advapi32.dll");
   ASSERT_TRUE(NULL != module);
 

chrome/installer/util/installer_state_unittest.cc

@@ -496,7 +496,15 @@ TEST_F(InstallerStateTest, IsFileInUse) {
   EXPECT_FALSE(MockInstallerState::IsFileInUse(temp_file));
 }
 
-TEST_F(InstallerStateTest, RemoveOldVersionDirs) {
+// TODO(jschuh): crbug.com/167707 need to fix Win64 pe_image issues due to
+// calling upgrade_test::GenerateSpecificPEFileVersion
+#if defined(OS_WIN) && defined(ARCH_CPU_X86_64)
+#define MAYBE_RemoveOldVersionDirs DISABLED_RemoveOldVersionDirs
+#else
+#define MAYBE_RemoveOldVersionDirs RemoveOldVersionDirs
+#endif
+
+TEST_F(InstallerStateTest, MAYBE_RemoveOldVersionDirs) {
   MockInstallerState installer_state;
   installer_state.set_target_path(test_dir_.path());
   EXPECT_EQ(test_dir_.path().value(), installer_state.target_path().value());