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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/engine/syncer.h

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/sync_scheduler_impl.cc ('k') | sync/engine/syncer.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.h
diff --git a/sync/engine/syncer.h b/sync/engine/syncer.h
index ee97b08c438e87cbdff8712f3010ef5375f4a571..0121152c528fb3f1016a4cb0e802b82fab13d42a 100644
--- a/sync/engine/syncer.h
+++ b/sync/engine/syncer.h
@@ -65,8 +65,6 @@ class Syncer {
bool early_exit_requested_;
base::Lock early_exit_requested_lock_;
- ConflictResolver resolver_;
-
friend class SyncerTest;
FRIEND_TEST_ALL_PREFIXES(SyncerTest, NameClashWithResolver);
FRIEND_TEST_ALL_PREFIXES(SyncerTest, IllegalAndLegalUpdates);
« sync/engine/all_status.cc ('K') | « sync/engine/sync_scheduler_impl.cc ('k') | sync/engine/syncer.cc » ('j') | sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698