Revert debug logging to ExtensionUnpackerTests. We have enough data.

BUG=108724
TEST=no

Review URL: https://chromiumcodereview.appspot.com/9270057

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

1 files changed, 5 insertions, 38 deletions

diff --git a/chrome/common/extensions/extension_unpacker_unittest.cc b/chrome/common/extensions/extension_unpacker_unittest.cc
index d3fb401..d50eb8c 100644
--- a/chrome/common/extensions/extension_unpacker_unittest.cc
+++ b/chrome/common/extensions/extension_unpacker_unittest.cc
@@ -47,77 +47,44 @@ public:
 };
 
 // Crashes intermittently on Windows, see http://crbug.com/109238
-// TODO(mpcomplete): Temporary enabled to debug.
-#if 0  // defined(OS_WIN)
+#if defined(OS_WIN)
 #define MAYBE_EmptyDefaultLocale DISABLED_EmptyDefaultLocale
 #else
 #define MAYBE_EmptyDefaultLocale EmptyDefaultLocale
 #endif
 TEST_F(ExtensionUnpackerTest, MAYBE_EmptyDefaultLocale) {
-  g_bug108724_debug = true;
-  LOG(WARNING) << "Setting up.";
   SetupUnpacker("empty_default_locale.crx");
-  LOG(WARNING) << "Running unpacker.";
   EXPECT_FALSE(unpacker_->Run());
-  LOG(WARNING) << "Done.";
   EXPECT_EQ(ASCIIToUTF16(errors::kInvalidDefaultLocale),
             unpacker_->error_message());
-  LOG(WARNING) << "Equal.";
-  LOG(WARNING) << "Cleanup: " << temp_dir_.Delete();
-  LOG(WARNING) << "Cleanup2:";
-  unpacker_.reset();
-  LOG(WARNING) << "All clean.";
-  g_bug108724_debug = false;
 }
 
 // Crashes intermittently on Vista, see http://crbug.com/109385
-// TODO(mpcomplete): Temporary enabled to debug.
-#if 0  // defined(OS_WIN)
+#if defined(OS_WIN)
 #define MAYBE_HasDefaultLocaleMissingLocalesFolder \
-    DISABLED_HasDefaultLocaleMissingLocalesFolder
+  DISABLED_HasDefaultLocaleMissingLocalesFolder
 #else
 #define MAYBE_HasDefaultLocaleMissingLocalesFolder \
-    HasDefaultLocaleMissingLocalesFolder
+  HasDefaultLocaleMissingLocalesFolder
 #endif
 TEST_F(ExtensionUnpackerTest, MAYBE_HasDefaultLocaleMissingLocalesFolder) {
-  g_bug108724_debug = true;
-  LOG(WARNING) << "Setting up.";
   SetupUnpacker("has_default_missing_locales.crx");
-  LOG(WARNING) << "Running unpacker.";
   EXPECT_FALSE(unpacker_->Run());
-  LOG(WARNING) << "Done.";
   EXPECT_EQ(ASCIIToUTF16(errors::kLocalesTreeMissing),
             unpacker_->error_message());
-  LOG(WARNING) << "Equal.";
-  LOG(WARNING) << "Cleanup: " << temp_dir_.Delete();
-  LOG(WARNING) << "Cleanup2:";
-  unpacker_.reset();
-  LOG(WARNING) << "All clean.";
-  g_bug108724_debug = false;
 }
 
 // Crashes intermittently on Windows, see http://crbug.com/109238
-// TODO(mpcomplete): Temporary enabled to debug.
-#if 0  // defined(OS_WIN)
+#if defined(OS_WIN)
 #define MAYBE_InvalidDefaultLocale DISABLED_InvalidDefaultLocale
 #else
 #define MAYBE_InvalidDefaultLocale InvalidDefaultLocale
 #endif
 TEST_F(ExtensionUnpackerTest, MAYBE_InvalidDefaultLocale) {
-  g_bug108724_debug = true;
-  LOG(WARNING) << "Setting up.";
   SetupUnpacker("invalid_default_locale.crx");
-  LOG(WARNING) << "Running unpacker.";
   EXPECT_FALSE(unpacker_->Run());
-  LOG(WARNING) << "Done.";
   EXPECT_EQ(ASCIIToUTF16(errors::kInvalidDefaultLocale),
             unpacker_->error_message());
-  LOG(WARNING) << "Equal.";
-  LOG(WARNING) << "Cleanup: " << temp_dir_.Delete();
-  LOG(WARNING) << "Cleanup2:";
-  unpacker_.reset();
-  LOG(WARNING) << "All clean.";
-  g_bug108724_debug = false;
 }
 
 // Crashes intermittently on Windows, see http://crbug.com/109738