| Index: chrome/browser/password_manager/password_generation_interactive_uitest.cc
|
| diff --git a/chrome/browser/password_manager/password_generation_interactive_uitest.cc b/chrome/browser/password_manager/password_generation_interactive_uitest.cc
|
| index 183b5f9b4bacf9d0320a16219552bb280a249d69..686d1ad40c2e06df861586b591f5f225bd9822d6 100644
|
| --- a/chrome/browser/password_manager/password_generation_interactive_uitest.cc
|
| +++ b/chrome/browser/password_manager/password_generation_interactive_uitest.cc
|
| @@ -136,14 +136,19 @@ class PasswordGenerationInteractiveTest : public InProcessBrowserTest {
|
|
|
| #if defined(USE_AURA)
|
| // Enabled on these platforms.
|
| -#define MAYBE_PopupShownAndPasswordSelected PopupShownAndPasswordSelected
|
| -#define MAYBE_PopupShownAndDismissed PopupShownAndDismissed
|
| -#define MAYBE_PopupShownAndDismissedByScrolling PopupShownAndDismissedByScrolling
|
| +// Disabled due to flakiness, see http://crbug.com/407998
|
| +#define MAYBE_PopupShownAndPasswordSelected \
|
| + DISABLED_PopupShownAndPasswordSelected
|
| +#define MAYBE_PopupShownAndDismissed DISABLED_PopupShownAndDismissed
|
| +#define MAYBE_PopupShownAndDismissedByScrolling \
|
| + DISABLED_PopupShownAndDismissedByScrolling
|
| #else
|
| // Popup not enabled for these platforms yet.
|
| -#define MAYBE_PopupShownAndPasswordSelected DISABLED_PopupShownAndPasswordSelected
|
| +#define MAYBE_PopupShownAndPasswordSelected \
|
| + DISABLED_PopupShownAndPasswordSelected
|
| #define MAYBE_PopupShownAndDismissed DISABLED_PopupShownAndDismissed
|
| -#define MAYBE_PopupShownAndDismissedByScrolling DISABLED_PopupShownAndDismissedByScrolling
|
| +#define MAYBE_PopupShownAndDismissedByScrolling \
|
| + DISABLED_PopupShownAndDismissedByScrolling
|
| #endif
|
|
|
| IN_PROC_BROWSER_TEST_F(PasswordGenerationInteractiveTest,
|
|
|