drive: Return cancel closure from FileSystem::GetFileContent

google_apis/drive/task_util.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GOOGLE_APIS_DRIVE_TASK_UTIL_H_
 #define GOOGLE_APIS_DRIVE_TASK_UTIL_H_
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop_proxy.h"
 
@@ skipping 77 matching lines @@
 template<typename T1, typename T2, typename T3, typename T4>
 struct ComposedCallback<void(T1, T2, T3, T4)> {
   static void Run(
       const base::Callback<void(const base::Closure&)>& runner,
       const base::Callback<void(T1, T2, T3, T4)>& callback,
       T1 arg1, T2 arg2, T3 arg3, T4 arg4) {
     runner.Run(base::Bind(callback, arg1, arg2, arg3, arg4));
   }
 };
 
-// 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
 // by binding them to |callback|, and runs |runner| with the closure.
 // I.e. the returned callback works as follows:
 //   runner.Run(Bind(callback, arg1, arg2, ...))
 template<typename CallbackType>
 CallbackType CreateComposedCallback(
     const base::Callback<void(const base::Closure&)>& runner,
     const CallbackType& callback) {
   DCHECK(!runner.is_null());
   DCHECK(!callback.is_null());
   return base::Bind(
       &internal::ComposedCallback<typename CallbackType::RunType>::Run,
       runner, callback);
 }
 
 // Returns callback which runs the given |callback| on the current thread.
 template<typename CallbackType>
 CallbackType CreateRelayCallback(const CallbackType& callback) {
   return CreateComposedCallback(
       base::Bind(&RunTaskOnThread, base::MessageLoopProxy::current()),
       callback);
 }
 
 }  // namespace google_apis
 
 #endif  // GOOGLE_APIS_DRIVE_TASK_UTIL_H_