Commit c6ee4d1b authored by pkasting@chromium.org's avatar pkasting@chromium.org

Supposedly r124125 made two disabled tests not be flaky anymore. Try re-enabling them.

BUG=80934,84420
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9559004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124492 0039d316-1c4b-4281-b951-d872f2087c98
parent 46ee9629
...@@ -1264,12 +1264,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, NonSubstitutingKeywordTest) { ...@@ -1264,12 +1264,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, NonSubstitutingKeywordTest) {
NonSubstitutingKeywordTest(); NonSubstitutingKeywordTest();
} }
#if defined(OS_POSIX)
// Flaky on Mac 10.6, Linux http://crbug.com/84420
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_DeleteItem) {
#else
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DeleteItem) { IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DeleteItem) {
#endif
DeleteItemTest(); DeleteItemTest();
} }
...@@ -1405,8 +1400,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, ...@@ -1405,8 +1400,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
} }
// http://crbug.com/12316 // http://crbug.com/12316
// Flaky, http://crbug.com/80934. IN_PROC_BROWSER_TEST_F(OmniboxViewTest, PasteReplacingAll) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_PasteReplacingAll) {
OmniboxView* omnibox_view = NULL; OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
AutocompletePopupModel* popup_model = omnibox_view->model()->popup_model(); AutocompletePopupModel* popup_model = omnibox_view->model()->popup_model();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment