Change code to use ScopedRunnableMethodFactory & a static callback

media/base/composite_filter.h

Index: media/base/composite_filter.h
diff --git a/media/base/composite_filter.h b/media/base/composite_filter.h
index d39b79dd18adef958057b7e979aa974bf28c6dcd..c1bd8c0f0685fd6ccd07714eac97dca089bce2da 100644
--- a/media/base/composite_filter.h
+++ b/media/base/composite_filter.h
@@ -117,8 +117,8 @@ class CompositeFilter : public Filter {
 
   // Helper function used by NewThreadSafeCallback() to make sure the
   // method gets called on the right thread.
-  void OnCallback(MessageLoop* message_loop,
-                  void (CompositeFilter::*method)());
+  static void OnCallback(MessageLoop* message_loop,
+                         CancelableTask* task);
 
   // Helper function that indicates whether SetError() calls can be forwarded
   // to the host of this filter.
@@ -157,6 +157,8 @@ class CompositeFilter : public Filter {
   // Error passed in the last SetError() call.
   PipelineError error_;
 
+  scoped_ptr<ScopedRunnableMethodFactory<CompositeFilter> > runnable_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(CompositeFilter);
 };