Convert //google_apis from scoped_ptr to std::unique_ptr

google_apis/drive/task_util.h

Index: google_apis/drive/task_util.h
diff --git a/google_apis/drive/task_util.h b/google_apis/drive/task_util.h
index 09c577a47d8f3e0fbece9fec019b6b4925fc287c..7f5a62437bc0e8b7b1782b8d2fd1f689b3944525 100644
--- a/google_apis/drive/task_util.h
+++ b/google_apis/drive/task_util.h
@@ -5,8 +5,9 @@
 #ifndef GOOGLE_APIS_DRIVE_TASK_UTIL_H_
 #define GOOGLE_APIS_DRIVE_TASK_UTIL_H_
 
+#include <memory>
+
 #include "base/bind.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/thread_task_runner_handle.h"
 
 namespace google_apis {
@@ -53,12 +54,13 @@ struct ComposedCallback<void(T1, T2)> {
 };
 
 // ComposedCallback with two arguments, and the last one is scoped_ptr.
-template<typename T1, typename T2, typename D2>
-struct ComposedCallback<void(T1, scoped_ptr<T2, D2>)> {
+template <typename T1, typename T2, typename D2>
+struct ComposedCallback<void(T1, std::unique_ptr<T2, D2>)> {
   static void Run(
       const base::Callback<void(const base::Closure&)>& runner,
-      const base::Callback<void(T1, scoped_ptr<T2, D2>)>& callback,
-      T1 arg1, scoped_ptr<T2, D2> arg2) {
+      const base::Callback<void(T1, std::unique_ptr<T2, D2>)>& callback,
+      T1 arg1,
+      std::unique_ptr<T2, D2> arg2) {
     runner.Run(base::Bind(callback, arg1, base::Passed(&arg2)));
   }
 };
@@ -75,12 +77,14 @@ struct ComposedCallback<void(T1, T2, T3)> {
 };
 
 // ComposedCallback with three arguments, and the last one is scoped_ptr.
-template<typename T1, typename T2, typename T3, typename D3>
-struct ComposedCallback<void(T1, T2, scoped_ptr<T3, D3>)> {
+template <typename T1, typename T2, typename T3, typename D3>
+struct ComposedCallback<void(T1, T2, std::unique_ptr<T3, D3>)> {
   static void Run(
       const base::Callback<void(const base::Closure&)>& runner,
-      const base::Callback<void(T1, T2, scoped_ptr<T3, D3>)>& callback,
-      T1 arg1, T2 arg2, scoped_ptr<T3, D3> arg3) {
+      const base::Callback<void(T1, T2, std::unique_ptr<T3, D3>)>& callback,
+      T1 arg1,
+      T2 arg2,
+      std::unique_ptr<T3, D3> arg3) {
     runner.Run(base::Bind(callback, arg1, arg2, base::Passed(&arg3)));
   }
 };