Change MojoDecryptorService to take a Decryptor

media/mojo/clients/mojo_decryptor_unittest.cc

 // Copyright 2017 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 <stdint.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/test/test_message_loop.h"
-#include "media/base/cdm_context.h"
-#include "media/base/content_decryption_module.h"
 #include "media/base/decryptor.h"
 #include "media/base/mock_filters.h"
 #include "media/base/video_frame.h"
 #include "media/mojo/clients/mojo_decryptor.h"
 #include "media/mojo/common/mojo_shared_buffer_video_frame.h"
 #include "media/mojo/interfaces/decryptor.mojom.h"
 #include "media/mojo/services/mojo_decryptor_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::Invoke;
 using testing::InSequence;
 using testing::IsNull;
 using testing::NotNull;
 using testing::SaveArg;
 using testing::StrictMock;
 using testing::_;
 
 namespace media {
 
 class MojoDecryptorTest : public ::testing::Test {
  public:
   MojoDecryptorTest() {
     decryptor_.reset(new StrictMock<MockDecryptor>());
 
-    cdm_context_.reset(new StrictMock<MockCdmContext>());
-    EXPECT_CALL(*cdm_context_, GetDecryptor())
-        .WillRepeatedly(Return(decryptor_.get()));
-
-    cdm_ = new StrictMock<MockCdm>(
-        base::Bind(&MojoDecryptorTest::OnSessionMessage,
-                   base::Unretained(this)),
-        base::Bind(&MojoDecryptorTest::OnSessionClosed, base::Unretained(this)),
-        base::Bind(&MojoDecryptorTest::OnSessionKeysChange,
-                   base::Unretained(this)),
-        base::Bind(&MojoDecryptorTest::OnSessionExpirationUpdate,
-                   base::Unretained(this)));
-    EXPECT_CALL(*cdm_.get(), GetCdmContext())
-        .WillRepeatedly(Return(cdm_context_.get()));
-
     mojom::DecryptorPtr remote_decryptor;
     mojo_decryptor_service_.reset(new MojoDecryptorService(
-        cdm_, mojo::MakeRequest(&remote_decryptor),
+        decryptor_.get(), mojo::MakeRequest(&remote_decryptor),
         base::Bind(&MojoDecryptorTest::OnConnectionClosed,
                    base::Unretained(this))));
 
     mojo_decryptor_.reset(new MojoDecryptor(std::move(remote_decryptor)));
   }
 
   ~MojoDecryptorTest() override {}
 
   void DestroyClient() {
     EXPECT_CALL(*this, OnConnectionClosed());
@@ skipping 24 matching lines @@
   void ReturnEOSVideoFrame(const scoped_refptr<DecoderBuffer>& encrypted,
                            const Decryptor::VideoDecodeCB& video_decode_cb) {
     // Simply create and return an End-Of-Stream VideoFrame.
     video_decode_cb.Run(Decryptor::kSuccess, VideoFrame::CreateEOSFrame());
   }
 
   MOCK_METHOD2(VideoDecoded,
                void(Decryptor::Status status,
                     const scoped_refptr<VideoFrame>& frame));
   MOCK_METHOD0(OnConnectionClosed, void());
-  MOCK_METHOD3(OnSessionMessage,
-               void(const std::string& session_id,
-                    ContentDecryptionModule::MessageType message_type,
-                    const std::vector<uint8_t>& message));
-  MOCK_METHOD1(OnSessionClosed, void(const std::string& session_id));
-  MOCK_METHOD2(OnSessionExpirationUpdate,
-               void(const std::string& session_id, base::Time new_expiry_time));
   MOCK_METHOD0(OnFrameDestroyed, void());
 
-  // MOCK methods don't work with move-only types like CdmKeysInfo. Add an extra
-  // OnSessionKeysChangeCalled() function to work around this.
-  MOCK_METHOD2(OnSessionKeysChangeCalled,
-               void(const std::string& session_id,
-                    bool has_additional_usable_key));
-  void OnSessionKeysChange(const std::string& session_id,
-                           bool has_additional_usable_key,
-                           CdmKeysInfo keys_info) {
-    OnSessionKeysChangeCalled(session_id, has_additional_usable_key);
-  }
-
  protected:
   // Fixture members.
   base::TestMessageLoop message_loop_;
 
   // The MojoDecryptor that we are testing.
   std::unique_ptr<MojoDecryptor> mojo_decryptor_;
 
   // The matching MojoDecryptorService for |mojo_decryptor_|.
   std::unique_ptr<MojoDecryptorService> mojo_decryptor_service_;
 
   // Helpers needed by |mojo_decryptor_service_|.

[xhwang, 2017/03/14 22:07:19]

nit: the decryptor_ is not really a helper here ;)

[jrummell, 2017/03/14 22:49:40]

Done.

   std::unique_ptr<StrictMock<MockDecryptor>> decryptor_;
-  std::unique_ptr<StrictMock<MockCdmContext>> cdm_context_;
-  scoped_refptr<StrictMock<MockCdm>> cdm_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MojoDecryptorTest);
 };
 
 TEST_F(MojoDecryptorTest, VideoDecodeFreesBuffer) {
   // Call DecryptAndDecodeVideo(). Once the callback VideoDecoded() completes,
   // the frame will be destroyed, and the buffer will be released.
   {
     InSequence seq;
@@ skipping 90 matching lines @@
   EXPECT_CALL(*decryptor_, DecryptAndDecodeVideo(_, _)).Times(0);
 
   scoped_refptr<DecoderBuffer> buffer(new DecoderBuffer(100));
   mojo_decryptor_->DecryptAndDecodeVideo(
       std::move(buffer),
       base::Bind(&MojoDecryptorTest::VideoDecoded, base::Unretained(this)));
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace media