Chromium Code Reviews| Index: components/sync/engine_impl/conflict_resolver.cc | 
| diff --git a/components/sync/engine_impl/conflict_resolver.cc b/components/sync/engine_impl/conflict_resolver.cc | 
| index 3c028ba48ea9a2def50fc009f9f8f0f3521d92a0..ece1e4a0fb74fbb3eda38c2fb386359ff3984668 100644 | 
| --- a/components/sync/engine_impl/conflict_resolver.cc | 
| +++ b/components/sync/engine_impl/conflict_resolver.cc | 
| @@ -5,7 +5,6 @@ | 
| #include "components/sync/engine_impl/conflict_resolver.h" | 
| #include <list> | 
| -#include <set> | 
| #include <string> | 
| #include "base/metrics/histogram_macros.h" |