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..3fac28d4c570e8247ca036e2f8b45195dc77a245 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 DISABLED_EphemeralProfile |
+#else |
+#define MAYBE_EphemeralProfile 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)) |