Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(244)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/internal_api/js_sync_manager_observer_unittest.cc

Issue 11314008: sync: Follow-up to conflict resolution refactor (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:
View side-by-side diff with in-line comments
Download patch
« sync/engine/all_status.cc ('K') | « sync/engine/syncer_unittest.cc ('k') | sync/internal_api/public/engine/sync_status.h » ('j') | sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
5,
2,
7,
@@ -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();
« sync/engine/all_status.cc ('K') | « sync/engine/syncer_unittest.cc ('k') | sync/internal_api/public/engine/sync_status.h » ('j') | sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698