Change MojoDecryptorService to take a Decryptor

media/mojo/services/mojo_decryptor_service.h

 // 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.
 
 #ifndef MEDIA_MOJO_SERVICES_MOJO_DECRYPTOR_SERVICE_H_
 #define MEDIA_MOJO_SERVICES_MOJO_DECRYPTOR_SERVICE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "media/base/decryptor.h"
 #include "media/mojo/interfaces/decryptor.mojom.h"
 #include "media/mojo/services/media_mojo_export.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace media {
 
 class DecoderBuffer;
-class ContentDecryptionModule;
 class MojoDecoderBufferReader;
 class MojoDecoderBufferWriter;
 
 // A mojom::Decryptor implementation. This object is owned by the creator,
 // and uses a weak binding across the mojo interface.
 class MEDIA_MOJO_EXPORT MojoDecryptorService
     : NON_EXPORTED_BASE(public mojom::Decryptor) {
  public:
   using StreamType = media::Decryptor::StreamType;
   using Status = media::Decryptor::Status;
 
-  // Constructs a MojoDecryptorService and binds it to the |request|. Keeps a
-  // copy of |cdm| to prevent it from being deleted as long as it is needed.
+  // Constructs a MojoDecryptorService and binds it to the |request|.
   // |error_handler| will be called if a connection error occurs.
-  // TODO(jrummell): Ideally this should take a Decryptor instead of |cdm|.
-  // The owner of the MojoDecryptorService should control the lifetime of the
-  // CDM. Both this and the CDM are owned by MojoCdmService, so it seems
-  // possible. http://crbug.com/701107.
-  MojoDecryptorService(const scoped_refptr<ContentDecryptionModule>& cdm,
+  // Caller must ensure that |decryptor| outlives |this|.
+  MojoDecryptorService(media::Decryptor* decryptor,
                        mojo::InterfaceRequest<mojom::Decryptor> request,
                        const base::Closure& error_handler);
 
   ~MojoDecryptorService() final;
 
   // mojom::Decryptor implementation.
   void Initialize(mojo::ScopedDataPipeConsumerHandle receive_pipe,
                   mojo::ScopedDataPipeProducerHandle transmit_pipe) final;
   void Decrypt(StreamType stream_type,
                mojom::DecoderBufferPtr encrypted,
@@ skipping 45 matching lines @@
 
   // A weak binding is used to connect to the MojoDecryptor.
   mojo::Binding<mojom::Decryptor> binding_;
 
   // Helper class to send decrypted DecoderBuffer to the client.
   std::unique_ptr<MojoDecoderBufferWriter> mojo_decoder_buffer_writer_;
 
   // Helper class to receive encrypted DecoderBuffer from the client.
   std::unique_ptr<MojoDecoderBufferReader> mojo_decoder_buffer_reader_;
 
-  // Keep ownership of |cdm_| while it is being used. |decryptor_| is the actual
-  // Decryptor referenced by |cdm_|.
-  scoped_refptr<ContentDecryptionModule> cdm_;
   media::Decryptor* decryptor_;
 
   base::WeakPtr<MojoDecryptorService> weak_this_;
   base::WeakPtrFactory<MojoDecryptorService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoDecryptorService);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_MOJO_DECRYPTOR_SERVICE_H_