| Index: chrome/browser/chromeos/login/saml/saml_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/login/saml/saml_browsertest.cc b/chrome/browser/chromeos/login/saml/saml_browsertest.cc
|
| index 743d6999c6d71696ee35e4aa67f7c10f48de6057..dda3f1fe05516dd36ae3185d96798a61689cc8b2 100644
|
| --- a/chrome/browser/chromeos/login/saml/saml_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/saml/saml_browsertest.cc
|
| @@ -1347,8 +1347,9 @@ IN_PROC_BROWSER_TEST_F(SAMLPolicyTest, TransferCookiesAffiliated) {
|
| }
|
|
|
| // PRE_TransferCookiesUnaffiliated and TransferCookiesUnaffiliated are flaky on
|
| -// MSAN and ASAN, most probably timing out. See crbug.com/683161.
|
| -#if defined(MEMORY_SANITIZER) || defined(ADDRESS_SANITIZER)
|
| +// MSAN, ASAN, Debug due to time out - most likely, because of the general
|
| +// slowness of the test. See crbug.com/683161, crbug.com/714167.
|
| +#if defined(MEMORY_SANITIZER) || defined(ADDRESS_SANITIZER) || !defined(NDEBUG)
|
| #define MAYBE_PRE_TransferCookiesUnaffiliated \
|
| DISABLED_PRE_TransferCookiesUnaffiliated
|
| #define MAYBE_TransferCookiesUnaffiliated DISABLED_TransferCookiesUnaffiliated
|
|
|