Convert //chrome/browser/sync_file_system from scoped_ptr to std::unique_ptr

chrome/browser/sync_file_system/drive_backend/sync_task_token.cc

Index: chrome/browser/sync_file_system/drive_backend/sync_task_token.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_token.cc b/chrome/browser/sync_file_system/drive_backend/sync_task_token.cc
index b7f730a587957b81202b8498ee9f38b16ad9a7e7..558cadb3f1e35ad239004a0dcace5a6becbfe344 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_task_token.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_task_token.cc
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include "base/bind.h"
+#include "base/memory/ptr_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h"
@@ -20,37 +21,34 @@ const int64_t SyncTaskToken::kForegroundTaskTokenID = 0;
 const int64_t SyncTaskToken::kMinimumBackgroundTaskTokenID = 1;
 
 // static
-scoped_ptr<SyncTaskToken> SyncTaskToken::CreateForTesting(
+std::unique_ptr<SyncTaskToken> SyncTaskToken::CreateForTesting(
     const SyncStatusCallback& callback) {
-  return make_scoped_ptr(new SyncTaskToken(
-      base::WeakPtr<SyncTaskManager>(),
-      base::ThreadTaskRunnerHandle::Get(),
-      kTestingTaskTokenID,
-      nullptr,  // task_blocker
-      callback));
+  return base::WrapUnique(new SyncTaskToken(base::WeakPtr<SyncTaskManager>(),
+                                            base::ThreadTaskRunnerHandle::Get(),
+                                            kTestingTaskTokenID,
+                                            nullptr,  // task_blocker
+                                            callback));
 }
 
 // static
-scoped_ptr<SyncTaskToken> SyncTaskToken::CreateForForegroundTask(
+std::unique_ptr<SyncTaskToken> SyncTaskToken::CreateForForegroundTask(
     const base::WeakPtr<SyncTaskManager>& manager,
     base::SequencedTaskRunner* task_runner) {
-  return make_scoped_ptr(new SyncTaskToken(
-      manager,
-      task_runner,
-      kForegroundTaskTokenID,
-      nullptr,  // task_blocker
-      SyncStatusCallback()));
+  return base::WrapUnique(new SyncTaskToken(manager, task_runner,
+                                            kForegroundTaskTokenID,
+                                            nullptr,  // task_blocker
+                                            SyncStatusCallback()));
 }
 
 // static
-scoped_ptr<SyncTaskToken> SyncTaskToken::CreateForBackgroundTask(
+std::unique_ptr<SyncTaskToken> SyncTaskToken::CreateForBackgroundTask(
     const base::WeakPtr<SyncTaskManager>& manager,
     base::SequencedTaskRunner* task_runner,
     int64_t token_id,
-    scoped_ptr<TaskBlocker> task_blocker) {
-  return make_scoped_ptr(new SyncTaskToken(manager, task_runner, token_id,
-                                           std::move(task_blocker),
-                                           SyncStatusCallback()));
+    std::unique_ptr<TaskBlocker> task_blocker) {
+  return base::WrapUnique(new SyncTaskToken(manager, task_runner, token_id,
+                                            std::move(task_blocker),
+                                            SyncStatusCallback()));
 }
 
 void SyncTaskToken::UpdateTask(const tracked_objects::Location& location,
@@ -77,21 +75,21 @@ SyncTaskToken::~SyncTaskToken() {
 
     // Reinitializes the token.
     SyncTaskManager::NotifyTaskDone(
-        make_scoped_ptr(new SyncTaskToken(manager_, task_runner_.get(),
-                                          token_id_, std::move(task_blocker_),
-                                          SyncStatusCallback())),
+        base::WrapUnique(new SyncTaskToken(manager_, task_runner_.get(),
+                                           token_id_, std::move(task_blocker_),
+                                           SyncStatusCallback())),
         SYNC_STATUS_OK);
   }
 }
 
 // static
 SyncStatusCallback SyncTaskToken::WrapToCallback(
-    scoped_ptr<SyncTaskToken> token) {
+    std::unique_ptr<SyncTaskToken> token) {
   return base::Bind(&SyncTaskManager::NotifyTaskDone, base::Passed(&token));
 }
 
 void SyncTaskToken::set_task_blocker(
-    scoped_ptr<TaskBlocker> task_blocker) {
+    std::unique_ptr<TaskBlocker> task_blocker) {
   task_blocker_ = std::move(task_blocker);
 }
 
@@ -130,11 +128,11 @@ void SyncTaskToken::RecordLog(const std::string& message) {
   task_log_->details.push_back(message);
 }
 
-void SyncTaskToken::SetTaskLog(scoped_ptr<TaskLogger::TaskLog> task_log) {
+void SyncTaskToken::SetTaskLog(std::unique_ptr<TaskLogger::TaskLog> task_log) {
   task_log_ = std::move(task_log);
 }
 
-scoped_ptr<TaskLogger::TaskLog> SyncTaskToken::PassTaskLog() {
+std::unique_ptr<TaskLogger::TaskLog> SyncTaskToken::PassTaskLog() {
   return std::move(task_log_);
 }
 
@@ -142,7 +140,7 @@ SyncTaskToken::SyncTaskToken(
     const base::WeakPtr<SyncTaskManager>& manager,
     const scoped_refptr<base::SequencedTaskRunner>& task_runner,
     int64_t token_id,
-    scoped_ptr<TaskBlocker> task_blocker,
+    std::unique_ptr<TaskBlocker> task_blocker,
     const SyncStatusCallback& callback)
     : manager_(manager),
       task_runner_(task_runner),