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 d4806016375717f908fdfb980d1ae5430f3c2e23..7b41e23e19760ee00053f4d467845c7ff95500a6 100644 |
--- a/chrome/browser/profiles/profile_manager_browsertest.cc |
+++ b/chrome/browser/profiles/profile_manager_browsertest.cc |
@@ -330,9 +330,13 @@ IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, |
EXPECT_EQ(path_profile2, browser_list->get(1)->profile()->GetPath()); |
} |
-// This test used to be flakily timing out on Windows: http://crbug.com/314905. |
-// If this happens again please make it a MAYBE_ test and reopen that bug. |
-IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, EphemeralProfile) { |
+// Flakes on Windows: http://crbug.com/314905 |
+#if defined(OS_WIN) |
+#define MAYBE_EphemeralProfile DISABLED_EphemeralProfile |
+#else |
+#define MAYBE_EphemeralProfile EphemeralProfile |
+#endif |
+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)) |