Drop NeedKeyCB from MediaKeys.

NeedKey is only fired in the demuxer and we already have
media::Demuxer::NeedKeyCB.

BUG=none
TEST=none
R=ddorwin@chromium.org

Review URL: https://codereview.chromium.org/23904027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227402 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 12 insertions, 23 deletions

diff --git a/media/base/media_keys.h b/media/base/media_keys.h
index 9369c50..c0fc56a 100644
--- a/media/base/media_keys.h
+++ b/media/base/media_keys.h
@@ -79,11 +79,6 @@ typedef base::Callback<void(const std::string& session_id,
 typedef base::Callback<void(const std::string& session_id,
                             const std::vector<uint8>& message,
                             const std::string& default_url)> KeyMessageCB;
-
-typedef base::Callback<void(const std::string& session_id,
-                            const std::string& type,
-                            const std::vector<uint8>& init_data)> NeedKeyCB;
-
 }  // namespace media
 
 #endif  // MEDIA_BASE_MEDIA_KEYS_H_
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
index c9b57e7..698367fa 100644
--- a/media/filters/pipeline_integration_test.cc
+++ b/media/filters/pipeline_integration_test.cc
@@ -93,8 +93,7 @@ class FakeEncryptedMedia {
                             const std::vector<uint8>& message,
                             const std::string& default_url) = 0;
 
-    virtual void NeedKey(const std::string& session_id,
-                         const std::string& type,
+    virtual void NeedKey(const std::string& type,
                          const std::vector<uint8>& init_data,
                          AesDecryptor* decryptor) = 0;
   };
@@ -130,10 +129,9 @@ class FakeEncryptedMedia {
     app_->KeyMessage(session_id, message, default_url);
   }
 
-  void NeedKey(const std::string& session_id,
-               const std::string& type,
+  void NeedKey(const std::string& type,
                const std::vector<uint8>& init_data) {
-    app_->NeedKey(session_id, type, init_data, &decryptor_);
+    app_->NeedKey(type, init_data, &decryptor_);
   }
 
  private:
@@ -157,12 +155,9 @@ class KeyProvidingApp : public FakeEncryptedMedia::AppBase {
     current_session_id_ = session_id;
   }
 
-  virtual void NeedKey(const std::string& session_id,
-                       const std::string& type,
+  virtual void NeedKey(const std::string& type,
                        const std::vector<uint8>& init_data,
                        AesDecryptor* decryptor) OVERRIDE {
-    current_session_id_ = session_id;
-
     if (current_session_id_.empty()) {
       EXPECT_TRUE(decryptor->GenerateKeyRequest(type, kInitData,
                                                 arraysize(kInitData)));
@@ -203,8 +198,7 @@ class NoResponseApp : public FakeEncryptedMedia::AppBase {
     FAIL() << "Unexpected KeyMessage";
   }
 
-  virtual void NeedKey(const std::string& session_id,
-                       const std::string& type,
+  virtual void NeedKey(const std::string& type,
                        const std::vector<uint8>& init_data,
                        AesDecryptor* decryptor) OVERRIDE {
   }
@@ -243,7 +237,7 @@ class MockMediaSource {
 
   scoped_ptr<Demuxer> GetDemuxer() { return owned_chunk_demuxer_.Pass(); }
 
-  void set_need_key_cb(const NeedKeyCB& need_key_cb) {
+  void set_need_key_cb(const Demuxer::NeedKeyCB& need_key_cb) {
     need_key_cb_ = need_key_cb;
   }
 
@@ -325,7 +319,7 @@ class MockMediaSource {
                       const std::vector<uint8>& init_data) {
     DCHECK(!init_data.empty());
     CHECK(!need_key_cb_.is_null());
-    need_key_cb_.Run(std::string(), type, init_data);
+    need_key_cb_.Run(type, init_data);
   }
 
   scoped_ptr<TextTrack> OnTextTrack(TextKind kind,
@@ -342,7 +336,7 @@ class MockMediaSource {
   std::string mimetype_;
   ChunkDemuxer* chunk_demuxer_;
   scoped_ptr<Demuxer> owned_chunk_demuxer_;
-  NeedKeyCB need_key_cb_;
+  Demuxer::NeedKeyCB need_key_cb_;
 };
 
 class PipelineIntegrationTest
diff --git a/media/filters/pipeline_integration_test_base.cc b/media/filters/pipeline_integration_test_base.cc
index 3f0910a..3591849 100644
--- a/media/filters/pipeline_integration_test_base.cc
+++ b/media/filters/pipeline_integration_test_base.cc
@@ -68,7 +68,7 @@ void PipelineIntegrationTestBase::DemuxerNeedKeyCB(
     const std::vector<uint8>& init_data) {
   DCHECK(!init_data.empty());
   CHECK(!need_key_cb_.is_null());
-  need_key_cb_.Run(std::string(), type, init_data);
+  need_key_cb_.Run(type, init_data);
 }
 
 void PipelineIntegrationTestBase::OnEnded() {
diff --git a/media/filters/pipeline_integration_test_base.h b/media/filters/pipeline_integration_test_base.h
index ade9ad6..b140609 100644
--- a/media/filters/pipeline_integration_test_base.h
+++ b/media/filters/pipeline_integration_test_base.h
@@ -9,6 +9,7 @@
 #include "base/message_loop/message_loop.h"
 #include "media/audio/clockless_audio_sink.h"
 #include "media/audio/null_audio_sink.h"
+#include "media/base/demuxer.h"
 #include "media/base/filter_collection.h"
 #include "media/base/media_keys.h"
 #include "media/base/pipeline.h"
@@ -23,7 +24,6 @@ class FilePath;
 namespace media {
 
 class Decryptor;
-class Demuxer;
 
 // Empty MD5 hash string.  Used to verify empty video tracks.
 extern const char kNullVideoHash[];
@@ -95,7 +95,7 @@ class PipelineIntegrationTestBase {
   scoped_refptr<ClocklessAudioSink> clockless_audio_sink_;
   bool ended_;
   PipelineStatus pipeline_status_;
-  NeedKeyCB need_key_cb_;
+  Demuxer::NeedKeyCB need_key_cb_;
   VideoFrame::Format last_video_frame_format_;
 
   void OnStatusCallbackChecked(PipelineStatus expected_status,
@@ -104,7 +104,7 @@ class PipelineIntegrationTestBase {
   PipelineStatusCB QuitOnStatusCB(PipelineStatus expected_status);
   void DemuxerNeedKeyCB(const std::string& type,
                         const std::vector<uint8>& init_data);
-    void set_need_key_cb(const NeedKeyCB& need_key_cb) {
+  void set_need_key_cb(const Demuxer::NeedKeyCB& need_key_cb) {
     need_key_cb_ = need_key_cb;
   }