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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/engine/syncer.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.h ('k') | sync/engine/syncer_unittest.cc » ('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/engine/syncer.cc
diff --git a/sync/engine/syncer.cc b/sync/engine/syncer.cc
index 78178c5ac21f5b24424c5162dabd656703f0386e..fa42b3099452dd855676025c89ec131508a34b16 100644
--- a/sync/engine/syncer.cc
+++ b/sync/engine/syncer.cc
@@ -36,7 +36,6 @@ using sync_pb::ClientCommand;
namespace syncer {
-using sessions::ScopedSessionContextConflictResolver;
using sessions::StatusController;
using sessions::SyncSession;
using syncable::IS_UNAPPLIED_UPDATE;
@@ -86,8 +85,6 @@ void Syncer::RequestEarlyExit() {
void Syncer::SyncShare(sessions::SyncSession* session,
SyncerStep first_step,
SyncerStep last_step) {
- ScopedSessionContextConflictResolver scoped(session->context(),
- &resolver_);
session->mutable_status_controller()->UpdateStartTime();
SyncerStep current_step = first_step;
« sync/engine/all_status.cc ('K') | « sync/engine/syncer.h ('k') | sync/engine/syncer_unittest.cc » ('j') | sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698