Update Decryptor interface to support audio decoding.

media/filters/decrypting_video_decoder_unittest.cc

 // 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.
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/message_loop.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decrypt_config.h"
 #include "media/base/mock_callback.h"
 #include "media/base/mock_filters.h"
 #include "media/base/video_frame.h"
+#include "media/filters/decrypting_video_decoder.h"
 #include "media/filters/ffmpeg_decoder_unittest.h"
-#include "media/filters/decrypting_video_decoder.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using ::testing::_;
 using ::testing::AtMost;
 using ::testing::Invoke;
 using ::testing::IsNull;
 using ::testing::ReturnRef;
 using ::testing::SaveArg;
 using ::testing::StrictMock;
 
@@ skipping 175 matching lines @@
     if (!pending_init_cb_.is_null()) {
       ASSERT_TRUE(pending_video_decode_cb_.is_null());
       base::ResetAndReturn(&pending_init_cb_).Run(false);
       return;
     }
 
     AbortPendingVideoDecodeCB();
   }
 
   void Reset() {
-    EXPECT_CALL(*decryptor_, CancelDecryptAndDecodeVideo())
-        .WillRepeatedly(Invoke(
+    EXPECT_CALL(*decryptor_, ResetDecoder(Decryptor::kVideo))
+        .WillRepeatedly(InvokeWithoutArgs(
             this, &DecryptingVideoDecoderTest::AbortPendingVideoDecodeCB));
 
     decoder_->Reset(NewExpectedClosure());
     message_loop_.RunAllPending();
   }
 
   void Stop() {
-    EXPECT_CALL(*decryptor_, StopVideoDecoder())
-        .WillRepeatedly(Invoke(
+    EXPECT_CALL(*decryptor_, DeinitializeDecoder(Decryptor::kVideo))
+        .WillRepeatedly(InvokeWithoutArgs(
             this, &DecryptingVideoDecoderTest::AbortAllPendingCBs));
 
     decoder_->Stop(NewExpectedClosure());
     message_loop_.RunAllPending();
   }
 
   MOCK_METHOD1(RequestDecryptorNotification,
                void(const DecryptingVideoDecoder::DecryptorNotificationCB&));
 
   MOCK_METHOD2(FrameReady, void(VideoDecoder::Status,
@@ skipping 297 matching lines @@
   Stop();
 }
 
 // Test stopping when there is a pending reset on the decoder.
 // Reset is pending because it cannot complete when the video decode callback
 // is pending.
 TEST_F(DecryptingVideoDecoderTest, Stop_DuringPendingReset) {
   Initialize();
   EnterPendingDecodeState();
 
-  EXPECT_CALL(*decryptor_, CancelDecryptAndDecodeVideo());
+  EXPECT_CALL(*decryptor_, ResetDecoder(Decryptor::kVideo));
   EXPECT_CALL(*this, FrameReady(VideoDecoder::kOk, IsNull()));
 
   decoder_->Reset(NewExpectedClosure());
   Stop();
 }
 
 // Test stopping after the decoder has been reset.
 TEST_F(DecryptingVideoDecoderTest, Stop_AfterReset) {
   Initialize();
   EnterNormalDecodingState();
@@ skipping 40 matching lines @@
 
   EXPECT_CALL(*demuxer_, Read(_))
       .WillOnce(ReturnConfigChanged());
 
   // TODO(xhwang): Update this test when kConfigChanged is supported in
   // DecryptingVideoDecoder.
   ReadAndExpectFrameReadyWith(VideoDecoder::kDecodeError, null_video_frame_);
 }
 
 }  // namespace media