Encrypted Media: Replace DecryptorClient with key event callbacks.

media/filters/pipeline_integration_test.cc

Index: media/filters/pipeline_integration_test.cc
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
index 088d991cac98b4bfb44b777271028cee039184e0..6595bce02b7b1be6c92fda57f451b2e353e9d3be 100644
--- a/media/filters/pipeline_integration_test.cc
+++ b/media/filters/pipeline_integration_test.cc
@@ -7,7 +7,6 @@
 #include "base/bind.h"
 #include "base/string_util.h"
 #include "media/base/decoder_buffer.h"
-#include "media/base/decryptor_client.h"
 #include "media/base/test_data_util.h"
 #include "media/crypto/aes_decryptor.h"
 
@@ -121,6 +120,19 @@ class MockMediaSource {
     AppendData(initial_append_size_);
   }
 
+  MOCK_METHOD5(NeedKeyMock, void(const std::string& key_system,
+                                 const std::string& session_id,
+                                 const std::string& type,
+                                 const uint8* init_data,
+                                 int init_data_length));
+  void NeedKey(const std::string& key_system,
+               const std::string& session_id,
+               const std::string& type,
+               scoped_array<uint8> init_data, int init_data_length) {
+    NeedKeyMock(key_system, session_id, type,
+                init_data.get(), init_data_length);
+  }
+
   void DemuxerNeedKey(const std::string& type,
                       scoped_array<uint8> init_data, int init_data_size) {
     DCHECK(init_data.get());