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

Unified Diff: chrome/browser/profiles/profile_manager_browsertest.cc

Issue 58183006: Disable flaky test: ProfileManagerBrowserTest.EphemeralProfile (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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/profiles/profile_manager_browsertest.cc
diff --git a/chrome/browser/profiles/profile_manager_browsertest.cc b/chrome/browser/profiles/profile_manager_browsertest.cc
index 9fd635a361e4890d3b711a29140acc57e4515a7e..da642ac06cb815a55352aa95f0f57ed40dc18ac4 100644
--- a/chrome/browser/profiles/profile_manager_browsertest.cc
+++ b/chrome/browser/profiles/profile_manager_browsertest.cc
@@ -254,7 +254,13 @@ IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest,
EXPECT_EQ(path_profile2, browser_list->get(1)->profile()->GetPath());
}
-IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, EphemeralProfile) {
+#if defined(OS_WIN)
+// Flakily times out on Windows: http://crbug.com/314905
+#define MAYBE_EphemeralProfile EphemeralProfile;
+#else
+#define MAYBE_EphemeralProfile DISABLED_EphemeralProfile;
+#endif // defined(OS_WIN)
+IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, MAYBE_EphemeralProfile) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
« 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