| Index: components/sync/api/conflict_resolution.cc
|
| diff --git a/components/sync/api/conflict_resolution.cc b/components/sync/api/conflict_resolution.cc
|
| index 7486f7aa0065b7f59c7bae3819656df569c4942f..83a77c8c215c64845fdf5c0aa9c9ea5ed5aeeb6a 100644
|
| --- a/components/sync/api/conflict_resolution.cc
|
| +++ b/components/sync/api/conflict_resolution.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "components/sync/api/conflict_resolution.h"
|
|
|
| +#include <utility>
|
| +
|
| namespace syncer {
|
|
|
| // static
|
| @@ -32,7 +34,7 @@ std::unique_ptr<EntityData> ConflictResolution::ExtractData() {
|
| // Has data if and only if type is USE_NEW.
|
| DCHECK((type_ == USE_NEW) == !!data_);
|
| return std::move(data_);
|
| -};
|
| +}
|
|
|
| ConflictResolution::ConflictResolution(Type type,
|
| std::unique_ptr<EntityData> data)
|
|
|