Disabled StartupBrowserCreatorTest.UpdateWithTwoProfiles.

TBR=marja@chromium.org
BUG=379579

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274141 0039d316-1c4b-4281-b951-d872f2087c98
parent 57291d19
...@@ -709,14 +709,10 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, PRE_UpdateWithTwoProfiles) { ...@@ -709,14 +709,10 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, PRE_UpdateWithTwoProfiles) {
profile2->GetPrefs()->CommitPendingWrite(); profile2->GetPrefs()->CommitPendingWrite();
} }
#if defined (OS_MACOSX) // See crbug.com/376184 about improvements to this test on Mac.
// crbug.com/376184 // Disabled because it's flaky. http://crbug.com/379579
#define MAYBE_UpdateWithTwoProfiles DISABLED_UpdateWithTwoProfiles IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,
#else DISABLED_UpdateWithTwoProfiles) {
#define MAYBE_UpdateWithTwoProfiles UpdateWithTwoProfiles
#endif
IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, MAYBE_UpdateWithTwoProfiles) {
#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