Separate MediaKeys interface from Decryptor interface.

media/base/mock_filters.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_BASE_MOCK_FILTERS_H_
 #define MEDIA_BASE_MOCK_FILTERS_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 142 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAudioRenderer);
 };
 
 class MockDecryptor : public Decryptor {
  public:
   MockDecryptor();
   virtual ~MockDecryptor();
 
-  MOCK_METHOD4(GenerateKeyRequest, bool(const std::string& key_system,
-                                        const std::string& type,
-                                        const uint8* init_data,
-                                        int init_data_length));
-  MOCK_METHOD6(AddKey, void(const std::string& key_system,
-                            const uint8* key,
-                            int key_length,
-                            const uint8* init_data,
-                            int init_data_length,
-                            const std::string& session_id));
-  MOCK_METHOD2(CancelKeyRequest, void(const std::string& key_system,
-                                      const std::string& session_id));
+  MOCK_METHOD0(GetMediaKeys, MediaKeys*(void));
+
   MOCK_METHOD2(RegisterNewKeyCB, void(StreamType stream_type,
                                       const NewKeyCB& new_key_cb));
   MOCK_METHOD3(Decrypt, void(StreamType stream_type,
                              const scoped_refptr<DecoderBuffer>& encrypted,
                              const DecryptCB& decrypt_cb));
   MOCK_METHOD1(CancelDecrypt, void(StreamType stream_type));
   MOCK_METHOD2(InitializeAudioDecoder,
                void(const AudioDecoderConfig& config,
                     const DecoderInitCB& init_cb));
   MOCK_METHOD2(InitializeVideoDecoder,
@@ skipping 17 matching lines @@
  public:
   MockStatisticsCB();
   ~MockStatisticsCB();
 
   MOCK_METHOD1(OnStatistics, void(const media::PipelineStatistics& statistics));
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MOCK_FILTERS_H_