Enable interactive_ui_tests on Windows that now run mostly reliably.

r516772 was the last of many commits that resolved a number of problems
that made this test suite flaky on Windows. This CL enables tests that
had been disabled over time due to flakes, yet now seem to run okay.

BUG=133341,751031,751543,764415,789913
This CL was uploaded by git cl split.

R=sky@chromium.org

Change-Id: I753c741a9194f489f072cd86d72407a1294150c3
Reviewed-on: https://chromium-review.googlesource.com/784937Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Greg Thompson <grt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521416}

chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

@@ -458,7 +458,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_BrowserAccelerators) {
 #define MAYBE_PopupAccelerators PopupAccelerators
 #endif
 
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_PopupAccelerators) {
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_PopupAccelerators) {
   // Create a popup.
   Browser* popup = CreateBrowserForPopup(browser()->profile());
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(popup));
@@ -514,7 +514,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_PopupAccelerators) {
 #define MAYBE_BackspaceInKeywordMode BackspaceInKeywordMode
 #endif
 
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_BackspaceInKeywordMode) {
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_BackspaceInKeywordMode) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
@@ -568,8 +568,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_BackspaceInKeywordMode) {
             UTF16ToUTF8(omnibox_view->GetText()));
 }
 
-// Flaky on Windows and Linux. http://crbug.com/751543
-#if defined(OS_WIN) || defined(OS_LINUX)
+// Flaky on Linux. http://crbug.com/751543
+#if defined(OS_LINUX)
 #define MAYBE_Escape DISABLED_Escape
 #else
 #define MAYBE_Escape Escape
@@ -601,7 +601,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_Escape) {
 #define MAYBE_DesiredTLD DesiredTLD
 #endif
 
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_DesiredTLD) {
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_DesiredTLD) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
   OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
@@ -633,7 +633,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_DesiredTLD) {
 #define MAYBE_DesiredTLDWithTemporaryText DesiredTLDWithTemporaryText
 #endif
 
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_DesiredTLDWithTemporaryText) {
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_DesiredTLDWithTemporaryText) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
   OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
@@ -684,8 +684,16 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_DesiredTLDWithTemporaryText) {
 }
 
 // See http://crbug.com/431575.
+#if defined(OS_WIN)
+#define MAYBE_ClearUserTextAfterBackgroundCommit \
+  ClearUserTextAfterBackgroundCommit
+#else
+// Flaky; https;//crbug.com/751031.
+#define MAYBE_ClearUserTextAfterBackgroundCommit \
+  DISABLED_ClearUserTextAfterBackgroundCommit
+#endif
 IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
-                       DISABLED_ClearUserTextAfterBackgroundCommit) {
+                       MAYBE_ClearUserTextAfterBackgroundCommit) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
@@ -714,7 +722,13 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
   EXPECT_EQ(ASCIIToUTF16(url2.spec()), omnibox_view->GetText());
 }
 
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_AltEnter) {
+#if defined(OS_WIN)
+#define MAYBE_AltEnter AltEnter
+#else
+// https://crbug.com/751031
+#define MAYBE_AltEnter DISABLED_AltEnter
+#endif
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_AltEnter) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
@@ -775,7 +789,13 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_EnterToSearch) {
   EXPECT_EQ("http://www.foo.com/search?q=z", url.spec());
 }
 
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_EscapeToDefaultMatch) {
+#if defined(OS_WIN)
+#define MAYBE_EscapeToDefaultMatch EscapeToDefaultMatch
+#else
+// https://crbug.com/751031
+#define MAYBE_EscapeToDefaultMatch DISABLED_EscapeToDefaultMatch
+#endif
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_EscapeToDefaultMatch) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
   OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
@@ -811,7 +831,13 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_EscapeToDefaultMatch) {
   EXPECT_EQ(old_selected_line, popup_model->selected_line());
 }
 
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_BasicTextOperations) {
+#if defined(OS_WIN)
+#define MAYBE_BasicTextOperations BasicTextOperations
+#else
+// https://crbug.com/751031
+#define MAYBE_BasicTextOperations DISABLED_BasicTextOperations
+#endif
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_BasicTextOperations) {
   ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
   chrome::FocusLocationBar(browser());
 
@@ -905,7 +931,13 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_BasicTextOperations) {
 // Make sure the cursor position doesn't get set past the last character of
 // user input text when the URL is longer than the keyword.
 // (http://crbug.com/656209)
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_FocusSearchLongUrl) {
+#if defined(OS_WIN)
+#define MAYBE_FocusSearchLongUrl FocusSearchLongUrl
+#else
+// https://crbug.com/751031.
+#define MAYBE_FocusSearchLongUrl DISABLED_FocusSearchLongUrl
+#endif
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_FocusSearchLongUrl) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
@@ -919,8 +951,15 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_FocusSearchLongUrl) {
 
 // Make sure the display text is preserved when calling FocusSearch() when the
 // display text is not the permanent text.
+#if defined(OS_WIN)
+#define MAYBE_PreserveDisplayTextOnFocusSearch PreserveDisplayTextOnFocusSearch
+#else
+// https://crbug.com/751031.
+#define MAYBE_PreserveDisplayTextOnFocusSearch \
+  DISABLED_PreserveDisplayTextOnFocusSearch
+#endif
 IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
-                       DISABLED_PreserveDisplayTextOnFocusSearch) {
+                       MAYBE_PreserveDisplayTextOnFocusSearch) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
@@ -972,8 +1011,16 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
   EXPECT_EQ(19U, std::max(start, end));
 }
 
+#if defined(OS_WIN)
+#define MAYBE_AcceptKeywordByTypingQuestionMark \
+  AcceptKeywordByTypingQuestionMark
+#else
+// https://crbug.com/751031
+#define MAYBE_AcceptKeywordByTypingQuestionMark \
+  DISABLED_AcceptKeywordByTypingQuestionMark
+#endif
 IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
-                       DISABLED_AcceptKeywordByTypingQuestionMark) {
+                       MAYBE_AcceptKeywordByTypingQuestionMark) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
@@ -995,8 +1042,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
   EXPECT_FALSE(omnibox_view->model()->is_keyword_selected());
 }
 
-// Flaky on Windows and Linux. http://crbug.com/751543
-#if defined(OS_WIN) || defined(OS_LINUX)
+// Flaky on Linux. http://crbug.com/751543
+#if defined(OS_LINUX)
 #define MAYBE_AcceptKeywordBySpace DISABLED_AcceptKeywordBySpace
 #else
 #define MAYBE_AcceptKeywordBySpace AcceptKeywordBySpace
@@ -1371,7 +1418,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_DeleteItem) {
 #define MAYBE_TabAcceptKeyword TabAcceptKeyword
 #endif
 
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_TabAcceptKeyword) {
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_TabAcceptKeyword) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
@@ -1426,7 +1473,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_TabAcceptKeyword) {
 #define MAYBE_TabTraverseResultsTest TabTraverseResultsTest
 #endif
 
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_TabTraverseResultsTest) {
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_TabTraverseResultsTest) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
   OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
@@ -1519,8 +1566,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_TabTraverseResultsTest) {
 #define MAYBE_PersistKeywordModeOnTabSwitch PersistKeywordModeOnTabSwitch
 #endif
 
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
-                       DISABLED_PersistKeywordModeOnTabSwitch) {
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_PersistKeywordModeOnTabSwitch) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
@@ -1568,7 +1614,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
 #endif
 
 IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
-                       DISABLED_CtrlKeyPressedWithInlineAutocompleteTest) {
+                       MAYBE_CtrlKeyPressedWithInlineAutocompleteTest) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
   OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
@@ -1591,7 +1637,13 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
   EXPECT_EQ(old_text, omnibox_view->GetText());
 }
 
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_UndoRedo) {
+#if defined(OS_WIN)
+#define MAYBE_UndoRedo UndoRedo
+#else
+// https://crbug.com/751031.
+#define MAYBE_UndoRedo DISABLED_UndoRedo
+#endif
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_UndoRedo) {
   ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
   chrome::FocusLocationBar(browser());
 
@@ -1660,8 +1712,15 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_UndoRedo) {
   EXPECT_EQ(old_text, omnibox_view->GetText());
 }
 
+#if defined(OS_WIN)
+#define MAYBE_BackspaceDeleteHalfWidthKatakana BackspaceDeleteHalfWidthKatakana
+#else
+// https://crbug.com/751031
+#define MAYBE_BackspaceDeleteHalfWidthKatakana \
+  DISABLED_BackspaceDeleteHalfWidthKatakana
+#endif
 IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
-                       DISABLED_BackspaceDeleteHalfWidthKatakana) {
+                       MAYBE_BackspaceDeleteHalfWidthKatakana) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
   // Insert text: ﾀﾞ. This is two, 3-byte UTF-8 characters:
@@ -1687,8 +1746,13 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
 #endif
 }
 
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
-                       DISABLED_DoesNotUpdateAutocompleteOnBlur) {
+#if defined(OS_WIN)
+#define MAYBE_DoesNotUpdateAutocompleteOnBlur DoesNotUpdateAutocompleteOnBlur
+#else
+#define MAYBE_DoesNotUpdateAutocompleteOnBlur \
+  DISABLED_DoesNotUpdateAutocompleteOnBlur
+#endif
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_DoesNotUpdateAutocompleteOnBlur) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
   OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
@@ -1712,7 +1776,13 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
       omnibox_view->model()->autocomplete_controller()->input_.text());
 }
 
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_Paste) {
+#if defined(OS_WIN)
+#define MAYBE_Paste Paste
+#else
+// https://crbug.com/751031.
+#define MAYBE_Paste DISABLED_Paste
+#endif
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_Paste) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
   OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
@@ -1753,7 +1823,13 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_Paste) {
   // TODO(msw): Test that AltGr+V does not paste.
 }
 
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_CopyURLToClipboard) {
+#if defined(OS_WIN)
+#define MAYBE_CopyURLToClipboard CopyURLToClipboard
+#else
+// https://crbug.com/751031
+#define MAYBE_CopyURLToClipboard DISABLED_CopyURLToClipboard
+#endif
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_CopyURLToClipboard) {
   // Set permanent text thus making sure that omnibox treats 'google.com'
   // as URL (not as ordinary user input).
   OmniboxView* omnibox_view = NULL;
@@ -1796,7 +1872,13 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_CopyURLToClipboard) {
   EXPECT_EQ(target_url, url);
 }
 
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_CutURLToClipboard) {
+#if defined(OS_WIN)
+#define MAYBE_CutURLToClipboard CutURLToClipboard
+#else
+// https://crbug.com/751031
+#define MAYBE_CutURLToClipboard DISABLED_CutURLToClipboard
+#endif
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_CutURLToClipboard) {
   // Set permanent text thus making sure that omnibox treats 'google.com'
   // as URL (not as ordinary user input).
   OmniboxView* omnibox_view = NULL;
@@ -1839,7 +1921,13 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_CutURLToClipboard) {
   EXPECT_EQ(target_url, url);
 }
 
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_CopyTextToClipboard) {
+#if defined(OS_WIN)
+#define MAYBE_CopyTextToClipboard CopyTextToClipboard
+#else
+// https://crbug.com/751031
+#define MAYBE_CopyTextToClipboard DISABLED_CopyTextToClipboard
+#endif
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_CopyTextToClipboard) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
   const char* target_text = "foo";
@@ -1862,7 +1950,13 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_CopyTextToClipboard) {
   EXPECT_EQ(ASCIIToUTF16(target_text), omnibox_view->GetText());
 }
 
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_CutTextToClipboard) {
+#if defined(OS_WIN)
+#define MAYBE_CutTextToClipboard CutTextToClipboard
+#else
+// https://crbug.com/751031
+#define MAYBE_CutTextToClipboard DISABLED_CutTextToClipboard
+#endif
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_CutTextToClipboard) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
   const char* target_text = "foo";
@@ -1885,7 +1979,12 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_CutTextToClipboard) {
   EXPECT_EQ(base::string16(), omnibox_view->GetText());
 }
 
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_EditSearchEngines) {
+#if defined(OS_WIN)
+#define MAYBE_EditSearchEngines EditSearchEngines
+#else
+#define MAYBE_EditSearchEngines DISABLED_EditSearchEngines
+#endif
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_EditSearchEngines) {
   OmniboxView* omnibox_view = nullptr;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 #if defined(OS_CHROMEOS)
@@ -1907,8 +2006,14 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_EditSearchEngines) {
   EXPECT_FALSE(omnibox_view->model()->popup_model()->IsOpen());
 }
 
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
-                       DISABLED_CtrlArrowAfterArrowSuggestions) {
+#if defined(OS_WIN)
+#define MAYBE_CtrlArrowAfterArrowSuggestions CtrlArrowAfterArrowSuggestions
+#else
+// https://crbug.com/751031
+#define MAYBE_CtrlArrowAfterArrowSuggestions \
+  DISABLED_CtrlArrowAfterArrowSuggestions
+#endif
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_CtrlArrowAfterArrowSuggestions) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
   OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();