| 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 360fe38f416bd484650968c14411d69b25460a41..6b52c3a4aeb3b00a8765d04ddeb3d9b54d85c5d4 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
|
| @@ -201,7 +201,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest, FLAKY_Merge) {
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(TwoClientLivePasswordsSyncTest,
|
| - FLAKY_SetPassphraseAndThenSetupSync) {
|
| + SetPassphraseAndThenSetupSync) {
|
| ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
|
|
|
| ASSERT_TRUE(GetClient(0)->SetupSync());
|
|
|