Remove WebMediaPlayerProxy::video_decoder_ & FFmpegVideoDecoder::set_decryptor.

media/filters/pipeline_integration_test_base.h

Index: media/filters/pipeline_integration_test_base.h
diff --git a/media/filters/pipeline_integration_test_base.h b/media/filters/pipeline_integration_test_base.h
index 1268b39320e970d7329cd766f7c2bd44106a284d..0ece063404c1de3267a137be28fae315974e7f84 100644
--- a/media/filters/pipeline_integration_test_base.h
+++ b/media/filters/pipeline_integration_test_base.h
@@ -53,7 +53,7 @@ class PipelineIntegrationTestBase {
   bool WaitUntilCurrentTimeIsAfter(const base::TimeDelta& wait_time);
   scoped_ptr<FilterCollection> CreateFilterCollection(const std::string& url);
   scoped_ptr<FilterCollection> CreateFilterCollection(
-      ChunkDemuxerClient* client);
+      ChunkDemuxerClient* client, Decryptor* decryptor);

[xhwang, 2012/08/06 20:58:27]

nit: Forward-declare Decryptor in this file?

[acolwell GONE FROM CHROMIUM, 2012/08/06 21:53:56]

Done.

 
   // Returns the MD5 hash of all video frames seen.  Should only be called once
   // after playback completes.  First time hashes should be generated with
@@ -86,7 +86,7 @@ class PipelineIntegrationTestBase {
   void OnError(PipelineStatus status);
   void QuitAfterCurrentTimeTask(const base::TimeDelta& quit_time);
   scoped_ptr<FilterCollection> CreateFilterCollection(
-      const scoped_refptr<Demuxer>& demuxer);
+      const scoped_refptr<Demuxer>& demuxer, Decryptor* decryptor);
   void OnVideoRendererPaint();
 
   MOCK_METHOD1(OnSetOpaque, void(bool));