Change code to use ScopedRunnableMethodFactory & a static callback

media/base/composite_filter.h

 // Copyright (c) 2010 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 MEDIA_BASE_COMPOSITE_FILTER_H_
 #define MEDIA_BASE_COMPOSITE_FILTER_H_
 
 #include "base/threading/thread.h"
 #include "media/base/filter_host.h"
 #include "media/base/filters.h"
@@ skipping 99 matching lines @@
 
   // Helper function for handling errors during call sequences.
   void HandleError(PipelineError error);
 
   // Creates a callback that can be called from any thread, but is guaranteed
   // to call the specified method on the thread associated with this filter.
   FilterCallback* NewThreadSafeCallback(void (CompositeFilter::*method)());
 
   // 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.
   bool CanForwardError();
 
   // Vector of threads owned by the composite and used by filters in |filters_|.
   typedef std::vector<base::Thread*> FilterThreadVector;
   FilterThreadVector filter_threads_;
 
   // Vector of the filters added to the composite.
@@ skipping 18 matching lines @@
   // Message loop passed into the constructor.
   MessageLoop* message_loop_;
 
   // FilterHost implementation passed to Filters owned by this
   // object.
   scoped_ptr<FilterHostImpl> host_impl_;
 
   // Error passed in the last SetError() call.
   PipelineError error_;
 
+  scoped_ptr<ScopedRunnableMethodFactory<CompositeFilter> > runnable_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(CompositeFilter);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_COMPOSITE_FILTER_H_