| 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 08163b75b63f9a56d12f3ca763f2f9c7a4444258..3c028ba48ea9a2def50fc009f9f8f0f3521d92a0 100644
|
| --- a/components/sync/engine_impl/conflict_resolver.cc
|
| +++ b/components/sync/engine_impl/conflict_resolver.cc
|
| @@ -8,7 +8,7 @@
|
| #include <set>
|
| #include <string>
|
|
|
| -#include "base/metrics/histogram.h"
|
| +#include "base/metrics/histogram_macros.h"
|
| #include "components/sync/base/cryptographer.h"
|
| #include "components/sync/engine/cycle/update_counters.h"
|
| #include "components/sync/engine_impl/conflict_util.h"
|
|
|