| Index: chrome/browser/app_controller_mac_browsertest.mm
|
| diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm
|
| index 07eddc09d5df52cd6f9cf01ebb875d7440277782..52ced35b3bf71e57ea06ff5b41e58e875d55a644 100644
|
| --- a/chrome/browser/app_controller_mac_browsertest.mm
|
| +++ b/chrome/browser/app_controller_mac_browsertest.mm
|
| @@ -279,9 +279,15 @@ IN_PROC_BROWSER_TEST_F(AppControllerNewProfileManagementBrowserTest,
|
| UserManager::Hide();
|
| }
|
|
|
| +#if defined(ADDRESS_SANITIZER)
|
| +// Flaky under ASAN. See https://crbug.com/674475.
|
| +#define MAYBE_GuestProfileReopenWithNoWindows DISABLED_GuestProfileReopenWithNoWindows
|
| +#else
|
| +#define MAYBE_GuestProfileReopenWithNoWindows GuestProfileReopenWithNoWindows
|
| +#endif
|
| // Test that for a guest last profile, a reopen event opens the User Manager.
|
| IN_PROC_BROWSER_TEST_F(AppControllerNewProfileManagementBrowserTest,
|
| - GuestProfileReopenWithNoWindows) {
|
| + MAYBE_GuestProfileReopenWithNoWindows) {
|
| // Create the system profile. Set the guest as the last used profile so the
|
| // app controller can use it on init.
|
| CreateAndWaitForSystemProfile();
|
| @@ -305,8 +311,14 @@ IN_PROC_BROWSER_TEST_F(AppControllerNewProfileManagementBrowserTest,
|
| UserManager::Hide();
|
| }
|
|
|
| +#if defined(ADDRESS_SANITIZER)
|
| +// Flaky under ASAN. See https://crbug.com/674475.
|
| +#define MAYBE_AboutChromeForcesUserManager DISABLED_AboutChromeForcesUserManager
|
| +#else
|
| +#define MAYBE_AboutChromeForcesUserManager AboutChromeForcesUserManager
|
| +#endif
|
| IN_PROC_BROWSER_TEST_F(AppControllerNewProfileManagementBrowserTest,
|
| - AboutChromeForcesUserManager) {
|
| + MAYBE_AboutChromeForcesUserManager) {
|
| base::scoped_nsobject<AppController> ac([[AppController alloc] init]);
|
|
|
| // Create the guest profile, and set it as the last used profile so the
|
|
|