Index: sync/sessions/nudge_tracker_unittest.cc |
diff --git a/sync/sessions/nudge_tracker_unittest.cc b/sync/sessions/nudge_tracker_unittest.cc |
index c6a9dfb808de851eee8c2c76d677646a338519a3..db2bc3ebc033cf9142d856f1b64affdbc4c5a38b 100644 |
--- a/sync/sessions/nudge_tracker_unittest.cc |
+++ b/sync/sessions/nudge_tracker_unittest.cc |
@@ -369,6 +369,12 @@ TEST_F(NudgeTrackerTest, IsSyncRequired) { |
nudge_tracker_.RecordSuccessfulSyncCycle(); |
EXPECT_FALSE(nudge_tracker_.IsSyncRequired()); |
+ // Sync request for resolve conflict. |
+ nudge_tracker_.RecordCommitConflict(BOOKMARKS); |
+ EXPECT_TRUE(nudge_tracker_.IsSyncRequired()); |
+ nudge_tracker_.RecordSuccessfulSyncCycle(); |
+ EXPECT_FALSE(nudge_tracker_.IsSyncRequired()); |
+ |
// Local changes. |
nudge_tracker_.RecordLocalChange(ModelTypeSet(SESSIONS)); |
EXPECT_TRUE(nudge_tracker_.IsSyncRequired()); |