Reland: Remove reference counting from media::VideoDecoder and friends.

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 f733e6fe3ae76ed0336345fa1a0807089024d53d..46f998588e3566fc94952d34e6157eec24585419 100644
--- a/webkit/media/webmediaplayer_impl.h
+++ b/webkit/media/webmediaplayer_impl.h
@@ -272,6 +272,10 @@ class WebMediaPlayerImpl
   // painted.
   void FrameReady(const scoped_refptr<media::VideoFrame>& frame);
 
+  // Builds a FilterCollection based on the current configuration of
+  // WebMediaPlayerImpl.
+  scoped_ptr<media::FilterCollection> BuildFilterCollection();
+
   WebKit::WebFrame* frame_;
 
   // TODO(hclam): get rid of these members and read from the pipeline directly.
@@ -285,7 +289,6 @@ class WebMediaPlayerImpl
   // for DCHECKs so methods calls won't execute in the wrong thread.
   const scoped_refptr<base::MessageLoopProxy> main_loop_;
 
-  scoped_ptr<media::FilterCollection> filter_collection_;
   scoped_refptr<media::Pipeline> pipeline_;
   base::Thread media_thread_;
 
@@ -329,6 +332,9 @@ class WebMediaPlayerImpl
 
   bool incremented_externally_allocated_memory_;
 
+  // Factories for supporting GpuVideoDecoder. May be null.
+  scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories_;
+
   // Routes audio playback to either AudioRendererSink or WebAudio.
   scoped_refptr<WebAudioSourceProviderImpl> audio_source_provider_;
 
@@ -368,8 +374,6 @@ class WebMediaPlayerImpl
   // not NULL while the compositor is actively using this webmediaplayer.
   cc::VideoFrameProvider::Client* video_frame_provider_client_;
 
-  scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories_;
-
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };