Commit 621cacb5 authored by Allen Bauer's avatar Allen Bauer Committed by Commit Bot

Enable Browser Navigation tests which don't hard fail. Check for flakiness.

Change-Id: Id7f4268b5d37803a03a987840e79c79a6a7332e4
Reviewed-on: https://chromium-review.googlesource.com/c/1347610
Commit-Queue: Allen Bauer <kylixrd@chromium.org>
Reviewed-by: default avatarPeter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#613134}
parent 5569dcdf
...@@ -1320,9 +1320,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, ...@@ -1320,9 +1320,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
// This test verifies that the settings page isn't opened in the incognito // This test verifies that the settings page isn't opened in the incognito
// window. // window.
// Disabled until fixed for uber settings: http://crbug.com/111243
IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
DISABLED_Disposition_Settings_UseNonIncognitoWindow) { Disposition_Settings_UseNonIncognitoWindow) {
RunUseNonIncognitoWindowTest(GetSettingsURL()); RunUseNonIncognitoWindowTest(GetSettingsURL());
} }
...@@ -1350,9 +1349,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, ...@@ -1350,9 +1349,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
// This test verifies that the settings page isn't opened in the incognito // This test verifies that the settings page isn't opened in the incognito
// window from a non-incognito window (bookmark open-in-incognito trigger). // window from a non-incognito window (bookmark open-in-incognito trigger).
// Disabled until fixed for uber settings: http://crbug.com/111243
IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
DISABLED_Disposition_Settings_UseNonIncognitoWindowForBookmark) { Disposition_Settings_UseNonIncognitoWindowForBookmark) {
NavigateParams params(browser(), GetSettingsURL(), NavigateParams params(browser(), GetSettingsURL(),
ui::PAGE_TRANSITION_AUTO_BOOKMARK); ui::PAGE_TRANSITION_AUTO_BOOKMARK);
params.disposition = WindowOpenDisposition::OFF_THE_RECORD; params.disposition = WindowOpenDisposition::OFF_THE_RECORD;
...@@ -1374,9 +1372,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, ...@@ -1374,9 +1372,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
// of whether the user is trying to open it in incognito mode or not. // of whether the user is trying to open it in incognito mode or not.
// This test verifies that if incognito mode is forced (by policy), settings // This test verifies that if incognito mode is forced (by policy), settings
// page doesn't open at all. // page doesn't open at all.
// Disabled until fixed for uber settings: http://crbug.com/111243
IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
DISABLED_Disposition_Settings_DoNothingIfIncognitoIsForced) { Disposition_Settings_DoNothingIfIncognitoIsForced) {
RunDoNothingIfIncognitoIsForcedTest(GetSettingsURL()); RunDoNothingIfIncognitoIsForcedTest(GetSettingsURL());
} }
...@@ -1397,9 +1394,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, ...@@ -1397,9 +1394,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
} }
// This test makes sure a crashed singleton tab reloads from a new navigation. // This test makes sure a crashed singleton tab reloads from a new navigation.
// http://crbug.com/396371 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, NavigateToCrashedSingletonTab) {
IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
DISABLED_NavigateToCrashedSingletonTab) {
GURL singleton_url(GetContentSettingsURL()); GURL singleton_url(GetContentSettingsURL());
WebContents* web_contents = chrome::AddSelectedTabWithURL( WebContents* web_contents = chrome::AddSelectedTabWithURL(
browser(), singleton_url, ui::PAGE_TRANSITION_LINK); browser(), singleton_url, ui::PAGE_TRANSITION_LINK);
......
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