| Index: chrome/test/live_sync/two_client_live_passwords_sync_test.cc
|
| diff --git a/chrome/test/live_sync/two_client_live_passwords_sync_test.cc b/chrome/test/live_sync/two_client_live_passwords_sync_test.cc
|
| index bd3c24fd5e82eb421af31675619be8acfc10f2c4..aa48771944c73de3fad29ad681c45b784e183839 100644
|
| --- a/chrome/test/live_sync/two_client_live_passwords_sync_test.cc
|
| +++ b/chrome/test/live_sync/two_client_live_passwords_sync_test.cc
|
| @@ -77,7 +77,12 @@ IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest, Race) {
|
| ASSERT_TRUE(ContainsSamePasswordForms(actual_zero, actual_one));
|
| }
|
|
|
| +// TODO(sync): Remove FAILS_ annotation after http://crbug.com/59867 is fixed.
|
| +#if defined(OS_MACOSX)
|
| +IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest, FAILS_SetPassphrase) {
|
| +#else
|
| IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest, SetPassphrase) {
|
| +#endif
|
| ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
|
| GetClient(0)->service()->SetPassphrase(kValidPassphrase, true);
|
| GetClient(0)->AwaitPassphraseAccepted();
|
|
|