Commit 6a76fc3d authored by isherman@chromium.org's avatar isherman@chromium.org

Disable flaky test: ProfileManagerBrowserTest.EphemeralProfile

BUG=314905
R=pastarmovj@chromium.org
TBR=pastarmovj@chromium.org

Review URL: https://codereview.chromium.org/58183006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232861 0039d316-1c4b-4281-b951-d872f2087c98
parent aadd6db7
...@@ -254,7 +254,13 @@ IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, ...@@ -254,7 +254,13 @@ IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest,
EXPECT_EQ(path_profile2, browser_list->get(1)->profile()->GetPath()); 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) #if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796). // Disable this test in Metro+Ash for now (http://crbug.com/262796).
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
......
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