| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 return std::unique_ptr<AvatarMenu>( | 43 return std::unique_ptr<AvatarMenu>( |
| 44 new AvatarMenu(storage, NULL, browser())); | 44 new AvatarMenu(storage, NULL, browser())); |
| 45 } | 45 } |
| 46 | 46 |
| 47 private: | 47 private: |
| 48 std::unique_ptr<AvatarMenu> avatar_menu_; | 48 std::unique_ptr<AvatarMenu> avatar_menu_; |
| 49 | 49 |
| 50 DISALLOW_COPY_AND_ASSIGN(ProfileListDesktopBrowserTest); | 50 DISALLOW_COPY_AND_ASSIGN(ProfileListDesktopBrowserTest); |
| 51 }; | 51 }; |
| 52 | 52 |
| 53 #if defined(OS_WIN) | 53 #if defined(OS_WIN) || (defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)) |
| 54 // SignOut is flaky. So far only observed on Windows. crbug.com/357329. | 54 // SignOut is flaky on Windows, crbug.com/357329, |
| 55 // and Mac with ASAN, crbug.com/674497. |
| 55 #define MAYBE_SignOut DISABLED_SignOut | 56 #define MAYBE_SignOut DISABLED_SignOut |
| 56 #elif defined(OS_CHROMEOS) | 57 #elif defined(OS_CHROMEOS) |
| 57 // This test doesn't make sense for Chrome OS since it has a different | 58 // This test doesn't make sense for Chrome OS since it has a different |
| 58 // multi-profiles menu in the system tray instead. | 59 // multi-profiles menu in the system tray instead. |
| 59 #define MAYBE_SignOut DISABLED_SignOut | 60 #define MAYBE_SignOut DISABLED_SignOut |
| 60 #else | 61 #else |
| 61 #define MAYBE_SignOut SignOut | 62 #define MAYBE_SignOut SignOut |
| 62 #endif | 63 #endif |
| 63 IN_PROC_BROWSER_TEST_F(ProfileListDesktopBrowserTest, MAYBE_SignOut) { | 64 IN_PROC_BROWSER_TEST_F(ProfileListDesktopBrowserTest, MAYBE_SignOut) { |
| 64 if (!profiles::IsMultipleProfilesEnabled()) | 65 if (!profiles::IsMultipleProfilesEnabled()) |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 false, ProfileMetrics::SWITCH_PROFILE_ICON); | 139 false, ProfileMetrics::SWITCH_PROFILE_ICON); |
| 139 EXPECT_EQ(2u, browser_list->size()); | 140 EXPECT_EQ(2u, browser_list->size()); |
| 140 | 141 |
| 141 // Switch to the first profile without opening a new window. | 142 // Switch to the first profile without opening a new window. |
| 142 menu->SwitchToProfile(menu->GetIndexOfItemWithProfilePath(path_profile1), | 143 menu->SwitchToProfile(menu->GetIndexOfItemWithProfilePath(path_profile1), |
| 143 false, ProfileMetrics::SWITCH_PROFILE_ICON); | 144 false, ProfileMetrics::SWITCH_PROFILE_ICON); |
| 144 EXPECT_EQ(2u, browser_list->size()); | 145 EXPECT_EQ(2u, browser_list->size()); |
| 145 EXPECT_EQ(path_profile1, browser_list->get(0)->profile()->GetPath()); | 146 EXPECT_EQ(path_profile1, browser_list->get(0)->profile()->GetPath()); |
| 146 EXPECT_EQ(path_profile2, browser_list->get(1)->profile()->GetPath()); | 147 EXPECT_EQ(path_profile2, browser_list->get(1)->profile()->GetPath()); |
| 147 } | 148 } |
| OLD | NEW |