Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(211)

Unified Diff: chrome/browser/ui/webui/options2/options_ui2_browsertest.cc

Issue 10332175: Mark OptionsBorwserTest.LoadOptionsByURL flaky on all platforms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options2/options_ui2_browsertest.cc
diff --git a/chrome/browser/ui/webui/options2/options_ui2_browsertest.cc b/chrome/browser/ui/webui/options2/options_ui2_browsertest.cc
index 8b66a529361589e1cbbd280fdef098414783ea98..5730546e55f5cd9c6bd3a17ca63287beea1a9aa6 100644
--- a/chrome/browser/ui/webui/options2/options_ui2_browsertest.cc
+++ b/chrome/browser/ui/webui/options2/options_ui2_browsertest.cc
@@ -40,14 +40,8 @@ void OptionsBrowserTest::VerifyTitle() {
EXPECT_NE(title.find(expected_title), string16::npos);
}
-// Observed flaky on Win and Mac, see http://crbug.com/119671.
-#if defined(OS_WIN) || defined(OS_MACOSX)
-#define MAYBE_LoadOptionsByURL FLAKY_LoadOptionsByURL
-#else
-#define MAYBE_LoadOptionsByURL LoadOptionsByURL
-#endif
-
-IN_PROC_BROWSER_TEST_F(OptionsBrowserTest, MAYBE_LoadOptionsByURL) {
+// Flaky, see http://crbug.com/119671.
+IN_PROC_BROWSER_TEST_F(OptionsBrowserTest, FLAKY_LoadOptionsByURL) {
NavigateToSettings();
VerifyTitle();
VerifyNavbar();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698