Vanquish the remnants of media::MessageLoopFactory.

webkit/media/webmediaplayer_impl.h

Index: webkit/media/webmediaplayer_impl.h
diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
index dc02de3c1f565c0abd53f797f2d98c3f21d838b1..3183066fedf33e85cef0d4d60a062ed4bf8eae20 100644
--- a/webkit/media/webmediaplayer_impl.h
+++ b/webkit/media/webmediaplayer_impl.h
@@ -54,11 +54,12 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
+#include "base/threading/thread.h"
 #include "googleurl/src/gurl.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/decryptor.h"
-#include "media/base/message_loop_factory.h"
 #include "media/base/pipeline.h"
+#include "media/filters/gpu_video_decoder.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProvider.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
@@ -112,15 +113,15 @@ class WebMediaPlayerImpl
   // refactor RenderAudioSourceProvider to live under webkit/media/
   // instead of content/renderer/, see http://crbug.com/136442
 
-  WebMediaPlayerImpl(WebKit::WebFrame* frame,
-                     WebKit::WebMediaPlayerClient* client,
-                     base::WeakPtr<WebMediaPlayerDelegate> delegate,
-                     media::FilterCollection* collection,

[acolwell GONE FROM CHROMIUM, 2012/12/10 18:12:16]

How about we create a MediaContext object that holds the FilterCollection,
audio_renderer_sink, and media_thread so that we only have to pass one parameter
down through all the layers? Then we wouldn't have to route the GPU specific
details everywhere. The WebMediaPlayerImpl could then own this object instead of
maintaining the seperate member variables.

-                     WebKit::WebAudioSourceProvider* audio_source_provider,
-                     media::AudioRendererSink* audio_renderer_sink,
-                     media::MessageLoopFactory* message_loop_factory,
-                     MediaStreamClient* media_stream_client,
-                     media::MediaLog* media_log);
+  WebMediaPlayerImpl(
+      WebKit::WebFrame* frame,
+      WebKit::WebMediaPlayerClient* client,
+      base::WeakPtr<WebMediaPlayerDelegate> delegate,
+      WebKit::WebAudioSourceProvider* audio_source_provider,
+      media::AudioRendererSink* audio_renderer_sink,
+      const scoped_refptr<media::GpuVideoDecoder::Factories>& gpu_factories,
+      MediaStreamClient* media_stream_client,
+      media::MediaLog* media_log);
   virtual ~WebMediaPlayerImpl();
 
   virtual void load(const WebKit::WebURL& url, CORSMode cors_mode);
@@ -305,13 +306,12 @@ class WebMediaPlayerImpl
 
   scoped_ptr<media::FilterCollection> filter_collection_;
   scoped_refptr<media::Pipeline> pipeline_;
+  base::Thread media_thread_;
 
   // The currently selected key system. Empty string means that no key system
   // has been selected.
   WebKit::WebString current_key_system_;
 
-  scoped_ptr<media::MessageLoopFactory> message_loop_factory_;
-
   // Playback state.
   //
   // TODO(scherkus): we have these because Pipeline favours the simplicity of a