Change MojoDecryptorService to take a Decryptor

media/mojo/services/mojo_decryptor_service.cc

 // Copyright 2015 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 "media/mojo/services/mojo_decryptor_service.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/numerics/safe_conversions.h"
 #include "media/base/audio_decoder_config.h"
-#include "media/base/cdm_context.h"
-#include "media/base/content_decryption_module.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decryptor.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
 #include "media/mojo/common/media_type_converters.h"
 #include "media/mojo/common/mojo_decoder_buffer_converter.h"
 #include "media/mojo/common/mojo_shared_buffer_video_frame.h"
 #include "media/mojo/interfaces/demuxer_stream.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 
@@ skipping 17 matching lines @@
 
  private:
   scoped_refptr<VideoFrame> frame_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameResourceReleaserImpl);
 };
 
 }  // namespace
 
 MojoDecryptorService::MojoDecryptorService(
-    const scoped_refptr<ContentDecryptionModule>& cdm,
+    media::Decryptor* decryptor,
     mojo::InterfaceRequest<mojom::Decryptor> request,
     const base::Closure& error_handler)
-    : binding_(this, std::move(request)), cdm_(cdm), weak_factory_(this) {
+    : binding_(this, std::move(request)),
+      decryptor_(decryptor),
+      weak_factory_(this) {
   DVLOG(1) << __func__;
-  decryptor_ = cdm->GetCdmContext()->GetDecryptor();
   DCHECK(decryptor_);
   weak_this_ = weak_factory_.GetWeakPtr();
   binding_.set_connection_error_handler(error_handler);
 }
 
 MojoDecryptorService::~MojoDecryptorService() {}
 
 void MojoDecryptorService::Initialize(
     mojo::ScopedDataPipeConsumerHandle receive_pipe,
     mojo::ScopedDataPipeProducerHandle transmit_pipe) {
@@ skipping 177 matching lines @@
   if (frame->storage_type() == VideoFrame::STORAGE_MOJO_SHARED_BUFFER) {
     mojo::MakeStrongBinding(
         base::MakeUnique<FrameResourceReleaserImpl>(std::move(frame)),
         mojo::MakeRequest(&releaser));
   }
 
   callback.Run(status, std::move(mojo_frame), std::move(releaser));
 }
 
 }  // namespace media