Chromium Code Reviews| 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)) |