drive: Return cancel closure from FileSystem::GetFileContent

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 358c280b469439603e9946615999e969e81376c0..3cba9bd2cf40f90af4f399856002162e14b62f12 100644
--- a/google_apis/drive/task_util.h
+++ b/google_apis/drive/task_util.h
@@ -95,17 +95,6 @@ struct ComposedCallback<void(T1, T2, T3, T4)> {
   }
 };
 
-// ComposedCallback with four arguments, and the second one is scoped_ptr.
-template<typename T1, typename T2, typename D2, typename T3, typename T4>
-struct ComposedCallback<void(T1, scoped_ptr<T2, D2>, T3, T4)> {
-  static void Run(
-      const base::Callback<void(const base::Closure&)>& runner,
-      const base::Callback<void(T1, scoped_ptr<T2, D2>, T3, T4)>& callback,
-      T1 arg1, scoped_ptr<T2, D2> arg2, T3 arg3, T4 arg4) {
-    runner.Run(base::Bind(callback, arg1, base::Passed(&arg2), arg3, arg4));
-  }
-};
-
 }  // namespace internal
 
 // Returns callback that takes arguments (arg1, arg2, ...), create a closure