Reenable tests that were crashing due to a bad Vista Tests (3) bot.

BUG=108724,106381,108429,108721,109238,109385,109738
TEST=no


Review URL: http://codereview.chromium.org/9289010

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

4 files changed, 6 insertions, 98 deletions

diff --git a/chrome/common/extensions/extension_file_util_unittest.cc b/chrome/common/extensions/extension_file_util_unittest.cc
index 78fe617..2165d95 100644
--- a/chrome/common/extensions/extension_file_util_unittest.cc
+++ b/chrome/common/extensions/extension_file_util_unittest.cc
@@ -19,10 +19,6 @@
 
 namespace keys = extension_manifest_keys;
 
-#if defined(OS_WIN)
-// http://crbug.com/106381
-#define InstallUninstallGarbageCollect DISABLED_InstallUninstallGarbageCollect
-#endif
 TEST(ExtensionFileUtil, InstallUninstallGarbageCollect) {
   ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
@@ -108,11 +104,6 @@ TEST(ExtensionFileUtil, LoadExtensionWithoutLocalesFolder) {
   EXPECT_TRUE(error.empty());
 }
 
-#if defined(OS_WIN)
-// http://crbug.com/106381
-#define CheckIllegalFilenamesNoUnderscores \
-    DISABLED_CheckIllegalFilenamesNoUnderscores
-#endif
 TEST(ExtensionFileUtil, CheckIllegalFilenamesNoUnderscores) {
   ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
@@ -128,11 +119,6 @@ TEST(ExtensionFileUtil, CheckIllegalFilenamesNoUnderscores) {
                                                             &error));
 }
 
-#if defined(OS_WIN)
-// http://crbug.com/106381
-#define CheckIllegalFilenamesOnlyReserved \
-    DISABLED_CheckIllegalFilenamesOnlyReserved
-#endif
 TEST(ExtensionFileUtil, CheckIllegalFilenamesOnlyReserved) {
   ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
@@ -145,11 +131,6 @@ TEST(ExtensionFileUtil, CheckIllegalFilenamesOnlyReserved) {
                                                             &error));
 }
 
-#if defined(OS_WIN)
-// http://crbug.com/106381
-#define CheckIllegalFilenamesReservedAndIllegal \
-    DISABLED_CheckIllegalFilenamesReservedAndIllegal
-#endif
 TEST(ExtensionFileUtil, CheckIllegalFilenamesReservedAndIllegal) {
   ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
diff --git a/chrome/common/extensions/extension_l10n_util_unittest.cc b/chrome/common/extensions/extension_l10n_util_unittest.cc
index 52aabd5..4c0a997 100644
--- a/chrome/common/extensions/extension_l10n_util_unittest.cc
+++ b/chrome/common/extensions/extension_l10n_util_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -22,49 +22,6 @@ namespace keys = extension_manifest_keys;
 
 namespace {
 
-// crbug.com/108429: Crashing on Windows Vista bots.
-#if defined(OS_WIN)
-#define GetValidLocalesEmptyLocaleFolder \
-  DISABLED_GetValidLocalesEmptyLocaleFolder
-#define GetValidLocalesWithValidLocaleNoMessagesFile \
-  DISABLED_GetValidLocalesWithValidLocaleNoMessagesFile
-#define GetValidLocalesWithUnsupportedLocale \
-  DISABLED_GetValidLocalesWithUnsupportedLocale
-#define GetValidLocalesWithValidLocalesAndMessagesFile \
-  DISABLED_GetValidLocalesWithValidLocalesAndMessagesFile
-#define LoadMessageCatalogsValidFallback \
-  DISABLED_LoadMessageCatalogsValidFallback
-#define LoadMessageCatalogsMissingFiles DISABLED_LoadMessageCatalogsMissingFiles
-#define LoadMessageCatalogsBadJSONFormat \
-  DISABLED_LoadMessageCatalogsBadJSONFormat
-#define LoadMessageCatalogsDuplicateKeys \
-  DISABLED_LoadMessageCatalogsDuplicateKeys
-#define LocalizeEmptyManifest DISABLED_LocalizeEmptyManifest
-#define LocalizeManifestWithoutNameMsgAndEmptyDescription \
-  DISABLED_LocalizeManifestWithoutNameMsgAndEmptyDescription
-#define LocalizeManifestWithNameMsgAndEmptyDescription \
-  DISABLED_LocalizeManifestWithNameMsgAndEmptyDescription
-#define LocalizeManifestWithBadNameMsg DISABLED_LocalizeManifestWithBadNameMsg
-#define LocalizeManifestWithNameDescriptionDefaultTitleMsgs \
-  DISABLED_LocalizeManifestWithNameDescriptionDefaultTitleMsgs
-#define LocalizeManifestWithNameDescriptionOmniboxMsgs \
-  DISABLED_LocalizeManifestWithNameDescriptionOmniboxMsgs
-#define LocalizeManifestWithNameDescriptionFileHandlerTitle \
-  DISABLED_LocalizeManifestWithNameDescriptionFileHandlerTitle
-#define ShouldRelocalizeManifestWithNullManifest \
-  DISABLED_ShouldRelocalizeManifestWithNullManifest
-#define ShouldRelocalizeManifestEmptyManifest \
-  DISABLED_ShouldRelocalizeManifestEmptyManifest
-#define ShouldRelocalizeManifestWithDefaultLocale \
-  DISABLED_ShouldRelocalizeManifestWithDefaultLocale
-#define ShouldRelocalizeManifestWithCurrentLocale \
-  DISABLED_ShouldRelocalizeManifestWithCurrentLocale
-#define ShouldRelocalizeManifestSameCurrentLocale \
-  DISABLED_ShouldRelocalizeManifestSameCurrentLocale
-#define ShouldRelocalizeManifestDifferentCurrentLocale \
-  DISABLED_ShouldRelocalizeManifestDifferentCurrentLocale
-#endif
-
 TEST(ExtensionL10nUtil, GetValidLocalesEmptyLocaleFolder) {
   ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
diff --git a/chrome/common/extensions/extension_resource_unittest.cc b/chrome/common/extensions/extension_resource_unittest.cc
index f87314a..5dd33b4 100644
--- a/chrome/common/extensions/extension_resource_unittest.cc
+++ b/chrome/common/extensions/extension_resource_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -43,10 +43,6 @@ TEST(ExtensionResourceTest, CreateWithMissingResourceOnDisk) {
   EXPECT_TRUE(resource.GetFilePath().empty());
 }
 
-// crbug.com/108721. Disabled on Windows due to crashing on Vista.
-#if defined(OS_WIN)
-#define CreateWithAllResourcesOnDisk DISABLED_CreateWithAllResourcesOnDisk
-#endif
 TEST(ExtensionResourceTest, CreateWithAllResourcesOnDisk) {
   ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
diff --git a/chrome/common/extensions/extension_unpacker_unittest.cc b/chrome/common/extensions/extension_unpacker_unittest.cc
index d50eb8c..6e67389c 100644
--- a/chrome/common/extensions/extension_unpacker_unittest.cc
+++ b/chrome/common/extensions/extension_unpacker_unittest.cc
@@ -46,54 +46,28 @@ public:
   scoped_ptr<ExtensionUnpacker> unpacker_;
 };
 
-// Crashes intermittently on Windows, see http://crbug.com/109238
-#if defined(OS_WIN)
-#define MAYBE_EmptyDefaultLocale DISABLED_EmptyDefaultLocale
-#else
-#define MAYBE_EmptyDefaultLocale EmptyDefaultLocale
-#endif
-TEST_F(ExtensionUnpackerTest, MAYBE_EmptyDefaultLocale) {
+TEST_F(ExtensionUnpackerTest, EmptyDefaultLocale) {
   SetupUnpacker("empty_default_locale.crx");
   EXPECT_FALSE(unpacker_->Run());
   EXPECT_EQ(ASCIIToUTF16(errors::kInvalidDefaultLocale),
             unpacker_->error_message());
 }
 
-// Crashes intermittently on Vista, see http://crbug.com/109385
-#if defined(OS_WIN)
-#define MAYBE_HasDefaultLocaleMissingLocalesFolder \
-  DISABLED_HasDefaultLocaleMissingLocalesFolder
-#else
-#define MAYBE_HasDefaultLocaleMissingLocalesFolder \
-  HasDefaultLocaleMissingLocalesFolder
-#endif
-TEST_F(ExtensionUnpackerTest, MAYBE_HasDefaultLocaleMissingLocalesFolder) {
+TEST_F(ExtensionUnpackerTest, HasDefaultLocaleMissingLocalesFolder) {
   SetupUnpacker("has_default_missing_locales.crx");
   EXPECT_FALSE(unpacker_->Run());
   EXPECT_EQ(ASCIIToUTF16(errors::kLocalesTreeMissing),
             unpacker_->error_message());
 }
 
-// Crashes intermittently on Windows, see http://crbug.com/109238
-#if defined(OS_WIN)
-#define MAYBE_InvalidDefaultLocale DISABLED_InvalidDefaultLocale
-#else
-#define MAYBE_InvalidDefaultLocale InvalidDefaultLocale
-#endif
-TEST_F(ExtensionUnpackerTest, MAYBE_InvalidDefaultLocale) {
+TEST_F(ExtensionUnpackerTest, InvalidDefaultLocale) {
   SetupUnpacker("invalid_default_locale.crx");
   EXPECT_FALSE(unpacker_->Run());
   EXPECT_EQ(ASCIIToUTF16(errors::kInvalidDefaultLocale),
             unpacker_->error_message());
 }
 
-// Crashes intermittently on Windows, see http://crbug.com/109738
-#if defined(OS_WIN)
-#define MAYBE_InvalidMessagesFile DISABLE_InvalidMessagesFile
-#else
-#define MAYBE_InvalidMessagesFile InvalidMessagesFile
-#endif
-TEST_F(ExtensionUnpackerTest, MAYBE_InvalidMessagesFile) {
+TEST_F(ExtensionUnpackerTest, InvalidMessagesFile) {
   SetupUnpacker("invalid_messages_file.crx");
   EXPECT_FALSE(unpacker_->Run());
   EXPECT_TRUE(MatchPattern(unpacker_->error_message(),