summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-11 20:04:23 +0000
committercsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-11 20:04:23 +0000
commite795b0762091947662d8e4fc572a8c9d01488dd5 (patch)
treeba3f564ea0c56fdac87949ad99aa2139248c4b87
parent242b6004efd604c50a0d9ff95a8c69e94c270923 (diff)
downloadchromium_src-e795b0762091947662d8e4fc572a8c9d01488dd5.zip
chromium_src-e795b0762091947662d8e4fc572a8c9d01488dd5.tar.gz
chromium_src-e795b0762091947662d8e4fc572a8c9d01488dd5.tar.bz2
Re-enable two unit unit tests that were disabled for Mac in Oct 2009.
These seem to be working fine on trybots now, so checking to see how these behave now. Will revert if necessary. BUG=26035 TEST=none Review URL: http://codereview.chromium.org/2738009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49580 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/extension_updater_unittest.cc13
1 files changed, 2 insertions, 11 deletions
diff --git a/chrome/browser/extensions/extension_updater_unittest.cc b/chrome/browser/extensions/extension_updater_unittest.cc
index 523502d..20e745a 100644
--- a/chrome/browser/extensions/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/extension_updater_unittest.cc
@@ -27,15 +27,6 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "libxml/globals.h"
-#if defined(OS_MACOSX)
-// These tests crash frequently on Mac 10.5 Tests debug. http://crbug.com/26035.
-#define MAYBE_TestBlacklistDownloading DISABLED_TestBlacklistDownloading
-#define MAYBE_TestBlacklistUpdateCheckRequests DISABLED_TestBlacklistUpdateCheckRequests
-#else
-#define MAYBE_TestBlacklistDownloading TestBlacklistDownloading
-#define MAYBE_TestBlacklistUpdateCheckRequests TestBlacklistUpdateCheckRequests
-#endif
-
using base::Time;
using base::TimeDelta;
@@ -830,7 +821,7 @@ TEST(ExtensionUpdaterTest, TestExtensionUpdateCheckRequestsPending) {
}
// This test is disabled on Mac, see http://crbug.com/26035.
-TEST(ExtensionUpdaterTest, MAYBE_TestBlacklistUpdateCheckRequests) {
+TEST(ExtensionUpdaterTest, TestBlacklistUpdateCheckRequests) {
ExtensionUpdaterTest::TestBlacklistUpdateCheckRequests();
}
@@ -855,7 +846,7 @@ TEST(ExtensionUpdaterTest, TestSingleExtensionDownloadingPending) {
}
// This test is disabled on Mac, see http://crbug.com/26035.
-TEST(ExtensionUpdaterTest, MAYBE_TestBlacklistDownloading) {
+TEST(ExtensionUpdaterTest, TestBlacklistDownloading) {
ExtensionUpdaterTest::TestBlacklistDownloading();
}