sync/sessions/nudge_tracker_unittest.cc - Issue 891123003: Revert of Sync commit errors should temporarily re-enable trigger pre-commit getupdates

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sync/sessions/nudge_tracker_unittest.cc

Issue 891123003: Revert of Sync commit errors should temporarily re-enable trigger pre-commit getupdates (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: sync/sessions/nudge_tracker_unittest.cc

diff --git a/sync/sessions/nudge_tracker_unittest.cc b/sync/sessions/nudge_tracker_unittest.cc

index db2bc3ebc033cf9142d856f1b64affdbc4c5a38b..c6a9dfb808de851eee8c2c76d677646a338519a3 100644

--- a/sync/sessions/nudge_tracker_unittest.cc

+++ b/sync/sessions/nudge_tracker_unittest.cc

@@ -369,12 +369,6 @@

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());

« no previous file with comments | « sync/sessions/nudge_tracker.cc ('k') | sync/sessions/test_util.h » ('j') | no next file with comments »