| Index: chrome/browser/sync/profile_sync_service_autofill_unittest.cc
|
| diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
|
| index 94433040916382d974a619bdef2acac86ffdb844..806f50c1f9a25c964f71495c95678c8e8b2304ac 100644
|
| --- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
|
| +++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
|
| @@ -1094,7 +1094,7 @@ TEST_F(ProfileSyncServiceAutofillTest, ProcessUserChangeRemoveProfile) {
|
| ASSERT_EQ(0U, new_sync_profiles.size());
|
| }
|
|
|
| -TEST_F(ProfileSyncServiceAutofillTest, ServerChangeRace) {
|
| +TEST_F(ProfileSyncServiceAutofillTest, FLAKY_ServerChangeRace) {
|
| // GetHistoryService() gets called indirectly, but the result is ignored, so
|
| // it is safe to return NULL.
|
| EXPECT_CALL(profile_, GetHistoryService(_)).
|
|
|