summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-29 19:20:17 +0000
committeryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-29 19:20:17 +0000
commit7dda8e190c792475ed140ba2e4d96512fd244988 (patch)
treec35a8cd652c993658cc4a6ce2f75f0203994361d
parent6e35e45bd46d5823f52c83ad2a26afcdfad72c57 (diff)
downloadchromium_src-7dda8e190c792475ed140ba2e4d96512fd244988.zip
chromium_src-7dda8e190c792475ed140ba2e4d96512fd244988.tar.gz
chromium_src-7dda8e190c792475ed140ba2e4d96512fd244988.tar.bz2
Reenable ExtensionServiceTest.UninstallExtension on Windows (speculatively).
under the presumption that http://codereview.chromium.org/8598028/ fixes the possible ScopedTempDir issues. BUG=96296 TEST=ExtensionServiceTest.UninstallExtension Review URL: http://codereview.chromium.org/8588071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111993 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/extension_service_unittest.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index ed7865a..6f3fc61 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -2773,14 +2773,7 @@ TEST_F(ExtensionServiceTest, ReloadExtensions) {
EXPECT_EQ(0u, service_->disabled_extensions()->size());
}
-// Tests uninstalling normal extensions.
-// Occasionally fails on Windows. See http://crbug.com/96296
-#if defined(OS_WIN)
-#define MAYBE_UninstallExtension FLAKY_UninstallExtension
-#else
-#define MAYBE_UninstallExtension UninstallExtension
-#endif
-TEST_F(ExtensionServiceTest, MAYBE_UninstallExtension) {
+TEST_F(ExtensionServiceTest, UninstallExtension) {
InitializeEmptyExtensionService();
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
UninstallExtension(good_crx, false);