Index: components/sync/engine_impl/syncer.cc |
diff --git a/components/sync/engine_impl/syncer.cc b/components/sync/engine_impl/syncer.cc |
index 5ae0bffb422408a2d5e9f884ac9de6b46012b53d..f4706a9ffd529573e3b2eec379019663905051cd 100644 |
--- a/components/sync/engine_impl/syncer.cc |
+++ b/components/sync/engine_impl/syncer.cc |
@@ -20,12 +20,10 @@ |
#include "components/sync/engine_impl/clear_server_data.h" |
#include "components/sync/engine_impl/commit.h" |
#include "components/sync/engine_impl/commit_processor.h" |
-#include "components/sync/engine_impl/conflict_resolver.h" |
#include "components/sync/engine_impl/cycle/nudge_tracker.h" |
#include "components/sync/engine_impl/get_updates_delegate.h" |
#include "components/sync/engine_impl/get_updates_processor.h" |
#include "components/sync/engine_impl/net/server_connection_manager.h" |
-#include "components/sync/engine_impl/syncer_types.h" |
#include "components/sync/syncable/directory.h" |
#include "components/sync/syncable/mutable_entry.h" |