Update Decryptor interface to support audio decoding.

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.
 //
 // A new breed of mock media filters, this time using gmock!  Feel free to add
 // actions if you need interesting side-effects.
 //
 // Don't forget you can use StrictMock<> and NiceMock<> if you want the mock
 // filters to fail the test or do nothing when an unexpected method is called.
 // http://code.google.com/p/googlemock/wiki/CookBook#Nice_Mocks_and_Strict_Mocks
@@ skipping 187 matching lines @@
                                         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_METHOD2(Decrypt, void(const scoped_refptr<DecoderBuffer>& encrypted,
+  MOCK_METHOD3(Decrypt, void(StreamType stream_type,
+                             const scoped_refptr<DecoderBuffer>& encrypted,
                              const DecryptCB& decrypt_cb));
-  MOCK_METHOD0(CancelDecrypt, void());
-  // TODO(xhwang): This is a workaround of the issue that move-only parameters
-  // are not supported in mocked methods. Remove this when the issue is fixed
-  // (http://code.google.com/p/googletest/issues/detail?id=395).
+  MOCK_METHOD1(CancelDecrypt, void(StreamType stream_type));
+  // TODO(xhwang): The following two methods are workarounds of the issue that
+  // move-only parameters are not supported in mocked methods. Remove when the
+  // issue is fixed: http://code.google.com/p/googletest/issues/detail?id=395
+  MOCK_METHOD3(InitializeAudioDecoderMock,
+               void(const AudioDecoderConfig& config,
+                    const DecoderInitCB& init_cb,
+                    const KeyAddedCB& key_added_cb));
   MOCK_METHOD3(InitializeVideoDecoderMock,
                void(const VideoDecoderConfig& config,
                     const DecoderInitCB& init_cb,
                     const KeyAddedCB& key_added_cb));
+  MOCK_METHOD2(DecryptAndDecodeAudio,
+               void(const scoped_refptr<media::DecoderBuffer>& encrypted,
+                    const AudioDecodeCB& audio_decode_cb));
   MOCK_METHOD2(DecryptAndDecodeVideo,
                void(const scoped_refptr<media::DecoderBuffer>& encrypted,
                     const VideoDecodeCB& video_decode_cb));
-  MOCK_METHOD0(CancelDecryptAndDecodeVideo, void());
-  MOCK_METHOD0(StopVideoDecoder, void());
+  MOCK_METHOD1(ResetDecoder, void(StreamType stream_type));
+  MOCK_METHOD1(DeinitializeDecoder, void(StreamType stream_type));
 
+  virtual void InitializeAudioDecoder(scoped_ptr<AudioDecoderConfig> config,
+                                      const DecoderInitCB& init_cb,
+                                      const KeyAddedCB& key_added_cb) OVERRIDE;
   virtual void InitializeVideoDecoder(scoped_ptr<VideoDecoderConfig> config,
                                       const DecoderInitCB& init_cb,
                                       const KeyAddedCB& key_added_cb) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockDecryptor);
 };
 
 class MockDecryptorClient : public DecryptorClient {
  public:
@@ skipping 66 matching lines @@
  public:
   MockStatisticsCB();
   ~MockStatisticsCB();
 
   MOCK_METHOD1(OnStatistics, void(const media::PipelineStatistics& statistics));
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MOCK_FILTERS_H_