[GTTF] Mark the following tests as no longer flaky:

AutocompleteEditViewTest.EnterToSearch (bug 31732)
BrowserTest.SingleBeforeUnloadAfterWindowClose (bug 27039)
FindInPageControllerTest.PreferPreviousSearch (bug 32312)
SessionRestoreUITest.DontRestoreWhileIncognito (bug 39490)
SessionRestoreUITest.ShareProcessesOnRestore (bug 40181)
TabRestoreUITest.RestoreToDifferentWindow (bug 14132, the other test is still flaky)

TEST=no longer flaky
BUG=31732, 27039, 32312, 39490, 40181, 14132

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

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

5 files changed, 5 insertions, 12 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc
index 82b05eb..23a7967 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc
@@ -428,7 +428,7 @@ IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, AltEnter) {
   ASSERT_NO_FATAL_FAILURE(WaitForTabOpenOrClose(tab_count + 1));
 }
 
-IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, FLAKY_EnterToSearch) {
+IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, EnterToSearch) {
   ASSERT_NO_FATAL_FAILURE(SetupHostResolver());
   ASSERT_NO_FATAL_FAILURE(SetupSearchEngine());
   browser()->FocusLocationBar();
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc
index d09be56..11b8519 100644
--- a/chrome/browser/browser_browsertest.cc
+++ b/chrome/browser/browser_browsertest.cc
@@ -265,12 +265,11 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, ReloadThenCancelBeforeUnload) {
         DISABLED_SingleBeforeUnloadAfterWindowClose
 #else
 #define MAYBE_SingleBeforeUnloadAfterWindowClose \
-        FLAKY_SingleBeforeUnloadAfterWindowClose
+        SingleBeforeUnloadAfterWindowClose
 #endif
 
 // Test for crbug.com/11647.  A page closed with window.close() should not have
 // two beforeunload dialogs shown.
-// Flaky: see http://crbug.com/27039
 IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_SingleBeforeUnloadAfterWindowClose) {
   browser()->GetSelectedTabContents()->render_view_host()->
       ExecuteJavascriptInWebFrame(L"", OPEN_NEW_BEFOREUNLOAD_PAGE);
diff --git a/chrome/browser/find_bar_host_browsertest.cc b/chrome/browser/find_bar_host_browsertest.cc
index bdcf4ce..7f48a65 100644
--- a/chrome/browser/find_bar_host_browsertest.cc
+++ b/chrome/browser/find_bar_host_browsertest.cc
@@ -825,9 +825,6 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, RestartSearchFromF3) {
 // When re-opening the find bar with F3, the find bar should be re-populated
 // with the last search from the same tab rather than the last overall search.
 // http://crbug.com/30006
-#if defined(OS_CHROMEOS)
-#define PreferPreviousSearch FLAKY_PreferPreviousSearch
-#endif
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PreferPreviousSearch) {
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc
index 1071306..3c6f8bc 100644
--- a/chrome/browser/sessions/session_restore_uitest.cc
+++ b/chrome/browser/sessions/session_restore_uitest.cc
@@ -327,8 +327,7 @@ TEST_F(SessionRestoreUITest, NormalAndPopup) {
 // Creates a browser, goes incognito, closes browser, launches and make sure
 // we don't restore.
 //
-// Flaky, http://crbug.com/39490.
-TEST_F(SessionRestoreUITest, FLAKY_DontRestoreWhileIncognito) {
+TEST_F(SessionRestoreUITest, DontRestoreWhileIncognito) {
   NavigateToURL(url1_);
 
   // Make sure we have one window.
@@ -435,8 +434,7 @@ TEST_F(SessionRestoreUITest,
 // process-per-site and process-per-site-instance, because we treat the new tab
 // as a special case in process-per-site-instance so that it only ever uses one
 // process.)
-// This is flaky on Vista dbg.  http://crbug.com/40181
-TEST_F(SessionRestoreUITest, FLAKY_ShareProcessesOnRestore) {
+TEST_F(SessionRestoreUITest, ShareProcessesOnRestore) {
   if (in_process_renderer()) {
     // No point in running this test in single process mode.
     return;
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc
index d5743a7..ec92c36 100644
--- a/chrome/browser/tab_restore_uitest.cc
+++ b/chrome/browser/tab_restore_uitest.cc
@@ -336,8 +336,7 @@ TEST_F(TabRestoreUITest, DISABLED_DontLoadRestoredTab) {
 
 // Open a window with multiple tabs, close a tab, then close the window.
 // Restore both and make sure the tab goes back into the window.
-// This test is flaky. See http://crbug.com/14132
-TEST_F(TabRestoreUITest, FLAKY_RestoreWindowAndTab) {
+TEST_F(TabRestoreUITest, RestoreWindowAndTab) {
   scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser_proxy.get());
   CheckActiveWindow(browser_proxy.get());