Convert //sync from scoped_ptr to std::unique_ptr

sync/api/conflict_resolution.h

Index: sync/api/conflict_resolution.h
diff --git a/sync/api/conflict_resolution.h b/sync/api/conflict_resolution.h
index 929d3e6e4e843cd4c0aab3eb245f8f4a998c1fbe..abc98eb70c1ba98d67f288561e03ef9e3dd5ef8a 100644
--- a/sync/api/conflict_resolution.h
+++ b/sync/api/conflict_resolution.h
@@ -5,7 +5,8 @@
 #ifndef SYNC_API_CONFLICT_RESOLUTION_H_
 #define SYNC_API_CONFLICT_RESOLUTION_H_
 
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
 #include "sync/api/entity_data.h"
 
 namespace syncer_v2 {
@@ -29,7 +30,7 @@ class SYNC_EXPORT ConflictResolution {
   // Convenience functions for brevity.
   static ConflictResolution UseLocal();
   static ConflictResolution UseRemote();
-  static ConflictResolution UseNew(scoped_ptr<EntityData> data);
+  static ConflictResolution UseNew(std::unique_ptr<EntityData> data);
 
   // Move constructor since we can't copy a scoped_ptr.
   ConflictResolution(ConflictResolution&& other);
@@ -38,13 +39,13 @@ class SYNC_EXPORT ConflictResolution {
   Type type() const { return type_; }
 
   // Get the data for USE_NEW, or nullptr. Can only be called once.
-  scoped_ptr<EntityData> ExtractData();
+  std::unique_ptr<EntityData> ExtractData();
 
  private:
-  ConflictResolution(Type type, scoped_ptr<EntityData> data);
+  ConflictResolution(Type type, std::unique_ptr<EntityData> data);
 
   const Type type_;
-  scoped_ptr<EntityData> data_;
+  std::unique_ptr<EntityData> data_;
 
   DISALLOW_COPY_AND_ASSIGN(ConflictResolution);
 };