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

Unified Diff: chrome/browser/profiles/profile_list_desktop_browsertest.cc

Issue 280603002: Disable ProfileListDesktopBrowserTest on Chrome OS since it has different multi-profiles UI (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/profiles/profile_list_desktop_browsertest.cc
diff --git a/chrome/browser/profiles/profile_list_desktop_browsertest.cc b/chrome/browser/profiles/profile_list_desktop_browsertest.cc
index f7b6b1a2997bc471b8025493e863c443b519a0ef..8f3c0b07e7c18257322a857af7f0b53301981229 100644
--- a/chrome/browser/profiles/profile_list_desktop_browsertest.cc
+++ b/chrome/browser/profiles/profile_list_desktop_browsertest.cc
@@ -49,9 +49,13 @@ class ProfileListDesktopBrowserTest : public InProcessBrowserTest {
DISALLOW_COPY_AND_ASSIGN(ProfileListDesktopBrowserTest);
};
-#if defined (OS_WIN)
+#if defined(OS_WIN)
// SignOut is flaky. So far only observed on Windows. crbug.com/357329.
#define MAYBE_SignOut DISABLED_SignOut
+#elif defined(OS_CHROMEOS)
rpetterson 2014/05/12 17:53:55 I've always seen that the disables are combined an
+// This test doesn't make sense for Chrome OS since it has a different
+// multi-profiles menu in the system tray instead.
+#define MAYBE_SignOut DISABLED_SignOut
#else
#define MAYBE_SignOut SignOut
#endif
@@ -85,7 +89,14 @@ IN_PROC_BROWSER_TEST_F(ProfileListDesktopBrowserTest, MAYBE_SignOut) {
chrome::HideUserManager();
}
-IN_PROC_BROWSER_TEST_F(ProfileListDesktopBrowserTest, SwitchToProfile) {
+#if defined(OS_CHROMEOS)
+// This test doesn't make sense for Chrome OS since it has a different
+// multi-profiles menu in the system tray instead.
+#define MAYBE_SwitchToProfile DISABLED_SwitchToProfile
+#else
+#define MAYBE_SwitchToProfile SwitchToProfile
+#endif
+IN_PROC_BROWSER_TEST_F(ProfileListDesktopBrowserTest, MAYBE_SwitchToProfile) {
#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