Teach BindToLoop to create callbacks that accept scoped parameters.

media/base/bind_to_loop.h.pump

Index: media/base/bind_to_loop.h.pump
diff --git a/media/base/bind_to_loop.h.pump b/media/base/bind_to_loop.h.pump
index a2b48bf0d19d79dacef40ab5ebccaec7efb1c34f..87c383e69e553c382a45fc624ff062dd2c05557e 100644
--- a/media/base/bind_to_loop.h.pump
+++ b/media/base/bind_to_loop.h.pump
@@ -16,7 +16,6 @@ $var MAX_ARITY = 7
 #define MEDIA_BASE_BIND_TO_LOOP_H_
 
 #include "base/bind.h"
-#include "base/callback_internal.h" // Avoid re-inventing CallbackForward.
 #include "base/location.h"
 #include "base/message_loop_proxy.h"
 
@@ -36,6 +35,28 @@ $var MAX_ARITY = 7
 
 namespace media {
 
+// Mimic base::internal::CallbackForward, replacing p.Pass() with
+// base::Passed(&p) to account for the extra layer of indirection.
+namespace internal {
+template <typename T>
+T& TrampolineForward(T& t) { return t; }
+
+template <typename T>
+base::internal::PassedWrapper<scoped_ptr<T> > TrampolineForward(
+    scoped_ptr<T>& p) { return base::Passed(&p); }
+
+template <typename T>
+base::internal::PassedWrapper<scoped_array<T> > TrampolineForward(
+    scoped_array<T>& p) { return base::Passed(&p); }
+
+template <typename T, typename R>
+base::internal::PassedWrapper<scoped_ptr_malloc<T, R> > TrampolineForward(
+    scoped_ptr_malloc<T, R>& p) { base::Passed(&p); }
+
+template <typename T>
+base::internal::PassedWrapper<ScopedVector<T> > TrampolineForward(
+    ScopedVector<T>& p) { return base::Passed(&p); }
+
 template <typename T> struct TrampolineHelper;
 
 $range ARITY 0..MAX_ARITY
@@ -52,18 +73,20 @@ $for ARG , [[A$(ARG) a$(ARG)]]
 ) {
     loop->PostTask(FROM_HERE, base::Bind(cb
 $if ARITY != 0 [[, ]]
-$for ARG , [[base::internal::CallbackForward(a$(ARG))]]));
+$for ARG , [[internal::TrampolineForward(a$(ARG))]]));
   }
 };
 
 
 ]]  $$ for ARITY
 
+}  // namespace internal
+
 template<typename T>
 static base::Callback<T> BindToLoop(
     const scoped_refptr<base::MessageLoopProxy>& loop,
     const base::Callback<T>& cb) {
-  return base::Bind(&TrampolineHelper<T>::Run, loop, cb);
+  return base::Bind(&internal::TrampolineHelper<T>::Run, loop, cb);
 }
 
 }  // namespace media