Re-enable some disabled tests that pass locally.

Can't be sure these aren't flaky, but surely they should not be DISABLED.

BUG=21321,14731,19394

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

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

3 files changed, 7 insertions, 18 deletions

diff --git a/chrome/browser/download/download_uitest.cc b/chrome/browser/download/download_uitest.cc
index b369f73..d3a7fff 100644
--- a/chrome/browser/download/download_uitest.cc
+++ b/chrome/browser/download/download_uitest.cc
@@ -292,8 +292,8 @@ TEST_F(DownloadTest, FLAKY_UnknownSize) {
               L"100% - " + filename.ToWStringHack());
 }
 
-// http://b/1158253
-TEST_F(DownloadTest, DISABLED_KnownSize) {
+// http://crbug.com/35275
+TEST_F(DownloadTest, FLAKY_KnownSize) {
   GURL url(URLRequestSlowDownloadJob::kKnownSizeUrl);
   FilePath filename;
   net::FileURLToFilePath(url, &filename);
diff --git a/chrome/test/automated_ui_tests/automated_ui_test_test.cc b/chrome/test/automated_ui_tests/automated_ui_test_test.cc
index 73e49ad..5ac393e 100644
--- a/chrome/test/automated_ui_tests/automated_ui_test_test.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_test_test.cc
@@ -14,20 +14,10 @@
 #if defined(OS_MACOSX)
 // The window pops up, but doesn't close.
 #define MAYBE_IncognitoWindow DISABLED_IncognitoWindow
-#define MAYBE_OpenCloseBrowserWindowWithAccelerator \
-    DISABLED_OpenCloseBrowserWindowWithAccelerator
-#else
-// http://code.google.com/p/chromium/issues/detail?id=14731
-#define MAYBE_IncognitoWindow DISABLED_IncognitoWindow
-// http://crbug.com/19394
-#define MAYBE_OpenCloseBrowserWindowWithAccelerator \
-    DISABLED_OpenCloseBrowserWindowWithAccelerator
-#endif
-
 // FindBarTesting not implemented on mac.
-#if defined(OS_MACOSX)
 #define MAYBE_FindInPage DISABLED_FindInPage
-#else
+#else  // !defined(OS_MACOSX)
+#define MAYBE_IncognitoWindow IncognitoWindow
 #define MAYBE_FindInPage FindInPage
 #endif
 
@@ -78,7 +68,7 @@ TEST_F(AutomatedUITestBase, DuplicateTab) {
   ASSERT_EQ(3, tab_count);
 }
 
-TEST_F(AutomatedUITestBase, DISABLED_RestoreTab) {
+TEST_F(AutomatedUITestBase, RestoreTab) {
   int tab_count;
   ASSERT_TRUE(active_browser()->GetTabCount(&tab_count));
   ASSERT_EQ(1, tab_count);
@@ -256,7 +246,7 @@ TEST_F(AutomatedUITestBase, MAYBE_IncognitoWindow) {
   ASSERT_EQ(1, num_browser_windows);
 }
 
-TEST_F(AutomatedUITestBase, MAYBE_OpenCloseBrowserWindowWithAccelerator) {
+TEST_F(AutomatedUITestBase, OpenCloseBrowserWindowWithAccelerator) {
   // Note: we don't use RunCommand(IDC_OPEN/CLOSE_WINDOW) to open/close
   // browser window in automated ui tests. Instead we use
   // OpenAndActivateNewBrowserWindow and CloseActiveWindow.
diff --git a/chrome/test/ui/dom_checker_uitest.cc b/chrome/test/ui/dom_checker_uitest.cc
index 84af7da..20f5b9f 100644
--- a/chrome/test/ui/dom_checker_uitest.cc
+++ b/chrome/test/ui/dom_checker_uitest.cc
@@ -233,8 +233,7 @@ TEST_F(DomCheckerTest, File) {
   PrintResults(new_passes, new_failures);
 }
 
-// TODO(arv): http://code.google.com/p/chromium/issues/detail?id=21321
-TEST_F(DomCheckerTest, DISABLED_Http) {
+TEST_F(DomCheckerTest, Http) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDomCheckerTest))
     return;