Remove threading from RendererGpuVideoAcceleratorFactories

media/base/bind_to_loop.h

Index: media/base/bind_to_loop.h
diff --git a/media/base/bind_to_loop.h b/media/base/bind_to_loop.h
index 92d358c7be9432ce6cc5f5b105816b1bf92b2414..e5727adf117d100db74d2b036d67c4485a3920f5 100644
--- a/media/base/bind_to_loop.h
+++ b/media/base/bind_to_loop.h
@@ -13,6 +13,7 @@
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
+#include "base/synchronization/waitable_event.h"
 
 // This is a helper utility for base::Bind()ing callbacks on to particular
 // MessageLoops.  A typical use is when |a| (of class |A|) wants to hand a
@@ -50,6 +51,10 @@ base::internal::PassedWrapper<ScopedVector<T> > TrampolineForward(
 
 template <typename T> struct TrampolineHelper;
 
+// Caller helper to call a base::Closure synchronously
+void TrampolineSyncCaller(const base::Closure& closure,
+                          base::WaitableEvent* waiter);
+
 template <>
 struct TrampolineHelper<void()> {
   static void Run(
@@ -57,6 +62,19 @@ struct TrampolineHelper<void()> {
       const base::Callback<void()>& cb) {
     loop->PostTask(FROM_HERE, base::Bind(cb));
   }
+  static void RunSync(
+      const scoped_refptr<base::MessageLoopProxy>& loop,
+      const base::Callback<void()>& cb) {
+    DCHECK(!loop->BelongsToCurrentThread());
+    base::WaitableEvent waiter(false, false);
+    loop->PostTask(
+        FROM_HERE,
+        base::Bind(
+            &TrampolineSyncCaller,
+            base::Bind(cb),
+            &waiter));
+    waiter.Wait();
+  }
 };
 
 
@@ -67,6 +85,19 @@ struct TrampolineHelper<void(A1)> {
       const base::Callback<void(A1)>& cb, A1 a1) {
     loop->PostTask(FROM_HERE, base::Bind(cb, internal::TrampolineForward(a1)));
   }
+  static void RunSync(
+      const scoped_refptr<base::MessageLoopProxy>& loop,
+      const base::Callback<void(A1)>& cb, A1 a1) {
+    DCHECK(!loop->BelongsToCurrentThread());
+    base::WaitableEvent waiter(false, false);
+    loop->PostTask(
+        FROM_HERE,
+        base::Bind(
+            &TrampolineSyncCaller,
+            base::Bind(cb, internal::TrampolineForward(a1)),
+            &waiter));
+    waiter.Wait();
+  }
 };
 
 
@@ -78,6 +109,20 @@ struct TrampolineHelper<void(A1, A2)> {
     loop->PostTask(FROM_HERE, base::Bind(cb, internal::TrampolineForward(a1),
         internal::TrampolineForward(a2)));
   }
+  static void RunSync(
+      const scoped_refptr<base::MessageLoopProxy>& loop,
+      const base::Callback<void(A1, A2)>& cb, A1 a1, A2 a2) {
+    DCHECK(!loop->BelongsToCurrentThread());
+    base::WaitableEvent waiter(false, false);
+    loop->PostTask(
+        FROM_HERE,
+        base::Bind(
+            &TrampolineSyncCaller,
+            base::Bind(cb, internal::TrampolineForward(a1),
+                internal::TrampolineForward(a2)),
+            &waiter));
+    waiter.Wait();
+  }
 };
 
 
@@ -89,6 +134,21 @@ struct TrampolineHelper<void(A1, A2, A3)> {
     loop->PostTask(FROM_HERE, base::Bind(cb, internal::TrampolineForward(a1),
         internal::TrampolineForward(a2), internal::TrampolineForward(a3)));
   }
+  static void RunSync(
+      const scoped_refptr<base::MessageLoopProxy>& loop,
+      const base::Callback<void(A1, A2, A3)>& cb, A1 a1, A2 a2, A3 a3) {
+    DCHECK(!loop->BelongsToCurrentThread());
+    base::WaitableEvent waiter(false, false);
+    loop->PostTask(
+        FROM_HERE,
+        base::Bind(
+            &TrampolineSyncCaller,
+            base::Bind(cb, internal::TrampolineForward(a1),
+                internal::TrampolineForward(a2),
+                internal::TrampolineForward(a3)),
+            &waiter));
+    waiter.Wait();
+  }
 };
 
 
@@ -102,6 +162,23 @@ struct TrampolineHelper<void(A1, A2, A3, A4)> {
         internal::TrampolineForward(a2), internal::TrampolineForward(a3),
         internal::TrampolineForward(a4)));
   }
+  static void RunSync(
+      const scoped_refptr<base::MessageLoopProxy>& loop,
+      const base::Callback<void(A1, A2, A3, A4)>& cb, A1 a1, A2 a2, A3 a3,
+          A4 a4) {
+    DCHECK(!loop->BelongsToCurrentThread());
+    base::WaitableEvent waiter(false, false);
+    loop->PostTask(
+        FROM_HERE,
+        base::Bind(
+            &TrampolineSyncCaller,
+            base::Bind(cb, internal::TrampolineForward(a1),
+                internal::TrampolineForward(a2),
+                internal::TrampolineForward(a3),
+                internal::TrampolineForward(a4)),
+            &waiter));
+    waiter.Wait();
+  }
 };
 
 
@@ -115,6 +192,24 @@ struct TrampolineHelper<void(A1, A2, A3, A4, A5)> {
         internal::TrampolineForward(a2), internal::TrampolineForward(a3),
         internal::TrampolineForward(a4), internal::TrampolineForward(a5)));
   }
+  static void RunSync(
+      const scoped_refptr<base::MessageLoopProxy>& loop,
+      const base::Callback<void(A1, A2, A3, A4, A5)>& cb, A1 a1, A2 a2, A3 a3,
+          A4 a4, A5 a5) {
+    DCHECK(!loop->BelongsToCurrentThread());
+    base::WaitableEvent waiter(false, false);
+    loop->PostTask(
+        FROM_HERE,
+        base::Bind(
+            &TrampolineSyncCaller,
+            base::Bind(cb, internal::TrampolineForward(a1),
+                internal::TrampolineForward(a2),
+                internal::TrampolineForward(a3),
+                internal::TrampolineForward(a4),
+                internal::TrampolineForward(a5)),
+            &waiter));
+    waiter.Wait();
+  }
 };
 
 
@@ -130,6 +225,25 @@ struct TrampolineHelper<void(A1, A2, A3, A4, A5, A6)> {
         internal::TrampolineForward(a4), internal::TrampolineForward(a5),
         internal::TrampolineForward(a6)));
   }
+  static void RunSync(
+      const scoped_refptr<base::MessageLoopProxy>& loop,
+      const base::Callback<void(A1, A2, A3, A4, A5, A6)>& cb, A1 a1, A2 a2,
+          A3 a3, A4 a4, A5 a5, A6 a6) {
+    DCHECK(!loop->BelongsToCurrentThread());
+    base::WaitableEvent waiter(false, false);
+    loop->PostTask(
+        FROM_HERE,
+        base::Bind(
+            &TrampolineSyncCaller,
+            base::Bind(cb, internal::TrampolineForward(a1),
+                internal::TrampolineForward(a2),
+                internal::TrampolineForward(a3),
+                internal::TrampolineForward(a4),
+                internal::TrampolineForward(a5),
+                internal::TrampolineForward(a6)),
+            &waiter));
+    waiter.Wait();
+  }
 };
 
 
@@ -145,6 +259,26 @@ struct TrampolineHelper<void(A1, A2, A3, A4, A5, A6, A7)> {
         internal::TrampolineForward(a4), internal::TrampolineForward(a5),
         internal::TrampolineForward(a6), internal::TrampolineForward(a7)));
   }
+  static void RunSync(
+      const scoped_refptr<base::MessageLoopProxy>& loop,
+      const base::Callback<void(A1, A2, A3, A4, A5, A6, A7)>& cb, A1 a1, A2 a2,
+          A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) {
+    DCHECK(!loop->BelongsToCurrentThread());
+    base::WaitableEvent waiter(false, false);
+    loop->PostTask(
+        FROM_HERE,
+        base::Bind(
+            &TrampolineSyncCaller,
+            base::Bind(cb, internal::TrampolineForward(a1),
+                internal::TrampolineForward(a2),
+                internal::TrampolineForward(a3),
+                internal::TrampolineForward(a4),
+                internal::TrampolineForward(a5),
+                internal::TrampolineForward(a6),
+                internal::TrampolineForward(a7)),
+            &waiter));
+    waiter.Wait();
+  }
 };
 
 
@@ -158,6 +292,13 @@ static base::Callback<T> BindToLoop(
 }
 
 template<typename T>
+static base::Callback<T> BindToLoopSync(
+    const scoped_refptr<base::MessageLoopProxy>& loop,
+    const base::Callback<T>& cb) {
+  return base::Bind(&internal::TrampolineHelper<T>::RunSync, loop, cb);
+}
+
+template<typename T>
 static base::Callback<T> BindToCurrentLoop(
     const base::Callback<T>& cb) {
   return BindToLoop(base::MessageLoopProxy::current(), cb);