Disable some flaky AppControllerNewProfileManagementBrowserTests on ASAN
BUG=674475
[email protected], [email protected]
Review-Url: https://codereview.chromium.org/2581683002
Cr-Commit-Position: refs/heads/master@{#438812}
diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm
index 07eddc0..52ced35b 100644
--- a/chrome/browser/app_controller_mac_browsertest.mm
+++ b/chrome/browser/app_controller_mac_browsertest.mm
@@ -279,9 +279,15 @@
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 @@
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
