Revert 194993 "Remove reference counting from media::VideoDecode..."

trunk/src/webkit/media/webmediaplayer_impl.h

Index: trunk/src/webkit/media/webmediaplayer_impl.h
===================================================================
--- trunk/src/webkit/media/webmediaplayer_impl.h	(revision 195011)
+++ trunk/src/webkit/media/webmediaplayer_impl.h	(working copy)
@@ -272,10 +272,6 @@
   // 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.
@@ -289,6 +285,7 @@
   // 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_;
 
@@ -332,9 +329,6 @@
 
   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_;
 
@@ -374,6 +368,8 @@
   // 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);
 };