Putting back tests that are excluded in bug 28808

BUG=28808
TEST=Run ui_tests

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

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

6 files changed, 3 insertions, 30 deletions

diff --git a/chrome/browser/browser_encoding_uitest.cc b/chrome/browser/browser_encoding_uitest.cc
index 18c3279..8d68314 100644
--- a/chrome/browser/browser_encoding_uitest.cc
+++ b/chrome/browser/browser_encoding_uitest.cc
@@ -47,13 +47,6 @@ class BrowserEncodingTest : public UITest {
   FilePath temp_sub_resource_dir_;
 };
 
-#if defined(OS_CHROMEOS)
-// These tests are flaky on linux/views builds.
-// See http://crbug.com/28808.
-#define TestEncodingAliasMapping FLAKY_TestEncodingAliasMapping
-#define TestEncodingAutoDetect FLAKY_TestEncodingAutoDetect
-#endif
-
 // TODO(jnd): 1. Some encodings are missing here. It'll be added later. See
 // http://crbug.com/13306.
 // 2. Add more files with multiple encoding name variants for each canonical
diff --git a/chrome/browser/process_singleton_linux_uitest.cc b/chrome/browser/process_singleton_linux_uitest.cc
index 0c3a63c..f325e59 100644
--- a/chrome/browser/process_singleton_linux_uitest.cc
+++ b/chrome/browser/process_singleton_linux_uitest.cc
@@ -82,8 +82,9 @@ TEST_F(ProcessSingletonLinuxTest, CheckSocketFile) {
 }
 
 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
-// This test is flaky on linux/views builds.
-// See http://crbug.com/28808.
+// The following tests in linux/view does not pass without a window manager,
+// which is true in build/try bots.
+// See http://crbug.com/30953.
 #define NotifyOtherProcessSuccess FLAKY_NotifyOtherProcessSuccess
 #define NotifyOtherProcessHostChanged FLAKY_NotifyOtherProcessHostChanged
 #endif
diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc
index 82d5692..ec4c8bc 100644
--- a/chrome/browser/sessions/session_restore_uitest.cc
+++ b/chrome/browser/sessions/session_restore_uitest.cc
@@ -90,9 +90,6 @@ class SessionRestoreUITest : public UITest {
 // This test is flaky on linux/views builds.
 // See http://crbug.com/28808.
 #define NormalAndPopup FLAKY_NormalAndPopup
-#define Basic FLAKY_Basic
-#define TwoTabsSecondSelected FLAKY_TwoTabsSecondSelected
-#define RestoresForwardAndBackwardNavs FLAKY_RestoresForwardAndBackwardNavs
 #endif
 
 
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 285a387..bf29fca 100644
--- a/chrome/test/automated_ui_tests/automated_ui_test_test.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_test_test.cc
@@ -62,13 +62,6 @@ TEST_F(AutomatedUITestBase, Home) {
   EXPECT_EQ(L"", title);
 }
 
-#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
-// These tests are flaky on linux/views builds.
-// See http://crbug.com/28808.
-#define OpenNewTabTest FLAKY_OpenNewTab
-#define OpenBrowserWindow FLAKY_OpenBrowserWindow
-#endif
-
 TEST_F(AutomatedUITestBase, OpenNewTab) {
   int tab_count;
   active_browser()->GetTabCount(&tab_count);
diff --git a/chrome/test/ui/mouseleave_uitest.cc b/chrome/test/ui/mouseleave_uitest.cc
index 7641218..8cb59c2 100644
--- a/chrome/test/ui/mouseleave_uitest.cc
+++ b/chrome/test/ui/mouseleave_uitest.cc
@@ -30,10 +30,6 @@
 // Test succeeds locally, flaky on trybot
 // http://code.google.com/p/chromium/issues/detail?id=26349
 #define MAYBE_TestOnMouseOut DISABLED_TestOnMouseOut
-#elif defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
-// Test is flaky on linux/views build.
-// http://crbug.com/28808.
-#define MAYBE_TestOnMouseOut FLAKY_TestOnMouseOut
 #endif
 
 namespace {
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 51eca16..7b12e2d 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -180,13 +180,6 @@ TEST_F(WorkerTest, WorkerFastLayoutTests) {
 #define SharedWorkerFastLayoutTests FLAKY_SharedWorkerFastLayoutTests
 #endif
 
-#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
-// These tests are flaky on linux/views builds.
-// See http://crbug.com/28808.
-#define MessagePorts FLAKY_MessagePorts
-#define SharedWorkerFastLayoutTests FLAKY_SharedWorkerFastLayoutTests
-#endif
-
 TEST_F(WorkerTest, SharedWorkerFastLayoutTests) {
   static const char* kLayoutTestFiles[] = {
     "shared-worker-constructor.html",