| Index: chrome/browser/password_manager/password_manager_browsertest.cc
|
| diff --git a/chrome/browser/password_manager/password_manager_browsertest.cc b/chrome/browser/password_manager/password_manager_browsertest.cc
|
| index 1bf5e34fbc2cf61e583307933ed89daa4c1463a3..f759c2bb152c07a38ecf65c780b279a65185689a 100644
|
| --- a/chrome/browser/password_manager/password_manager_browsertest.cc
|
| +++ b/chrome/browser/password_manager/password_manager_browsertest.cc
|
| @@ -1366,8 +1366,17 @@ IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest, NoLastLoadGoodLastLoad) {
|
| // all-but-action match. Normally, the former should be preferred, but if the
|
| // former has not finished matching, and the latter has, the latter should be
|
| // used (otherwise we'd give up even though we could have saved the password).
|
| +//
|
| +// Disabled on Mac due to flakiness: http://crbug.com/477812
|
| +#if defined(OS_MACOSX)
|
| +#define MAYBE_PreferPasswordFormManagerWhichFinishedMatching \
|
| + DISABLED_PreferPasswordFormManagerWhichFinishedMatching
|
| +#else
|
| +#define MAYBE_PreferPasswordFormManagerWhichFinishedMatching \
|
| + PreferPasswordFormManagerWhichFinishedMatching
|
| +#endif
|
| IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest,
|
| - PreferPasswordFormManagerWhichFinishedMatching) {
|
| + MAYBE_PreferPasswordFormManagerWhichFinishedMatching) {
|
| NavigateToFile("/password/create_form_copy_on_submit.html");
|
|
|
| NavigationObserver observer(WebContents());
|
|
|