sync/internal_api/js_sync_manager_observer_unittest.cc - Issue 11185064: FYI: Move conflict resolve + clean up afterwards

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/internal_api/js_sync_manager_observer_unittest.cc

Issue 11185064: FYI: Move conflict resolve + clean up afterwards (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 2 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:

Index: sync/internal_api/js_sync_manager_observer_unittest.cc

diff --git a/sync/internal_api/js_sync_manager_observer_unittest.cc b/sync/internal_api/js_sync_manager_observer_unittest.cc

index a65c3dc49ae10e4fcaedac39d650e6446097012a..128514cdb4640c8ec5db51e25a46fc4bb7394c5d 100644

--- a/sync/internal_api/js_sync_manager_observer_unittest.cc

+++ b/sync/internal_api/js_sync_manager_observer_unittest.cc

@@ -77,8 +77,6 @@ TEST_F(JsSyncManagerObserverTest, OnSyncCycleCompleted) {

ModelTypeSet(),

ProgressMarkerMap(),

false,

- true,

- 8,

@@ -92,7 +90,7 @@ TEST_F(JsSyncManagerObserverTest, OnSyncCycleCompleted) {

EXPECT_CALL(mock_js_event_handler_,

HandleJsEvent("onSyncCycleCompleted",

- HasDetailsAsDictionary(expected_details)));

+ HasDetailsAsDictionary(expected_details)));

js_sync_manager_observer_.OnSyncCycleCompleted(snapshot);

PumpLoop();