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

Unified Diff: chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

Issue 307213002: Disabled StartupBrowserCreatorTest.UpdateWithTwoProfiles. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months 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/ui/startup/startup_browser_creator_browsertest.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
index ec9be7602da0c838ea98d77d85521467b19df4cd..62812945533748c4c879822a817eadd131454173 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
@@ -709,14 +709,10 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, PRE_UpdateWithTwoProfiles) {
profile2->GetPrefs()->CommitPendingWrite();
}
-#if defined (OS_MACOSX)
-// crbug.com/376184
-#define MAYBE_UpdateWithTwoProfiles DISABLED_UpdateWithTwoProfiles
-#else
-#define MAYBE_UpdateWithTwoProfiles UpdateWithTwoProfiles
-#endif
-
-IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, MAYBE_UpdateWithTwoProfiles) {
+// See crbug.com/376184 about improvements to this test on Mac.
+// Disabled because it's flaky. http://crbug.com/379579
+IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,
+ DISABLED_UpdateWithTwoProfiles) {
#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