Change MojoDecryptorService to take a Decryptor

media/mojo/services/mojo_decryptor_service.h

Index: media/mojo/services/mojo_decryptor_service.h
diff --git a/media/mojo/services/mojo_decryptor_service.h b/media/mojo/services/mojo_decryptor_service.h
index 13149776313d6193478f9a91cb9be0e0109f62ea..30a94b5a57d891e55f42e8b1da7a1d1de621a8f6 100644
--- a/media/mojo/services/mojo_decryptor_service.h
+++ b/media/mojo/services/mojo_decryptor_service.h
@@ -21,7 +21,6 @@
 namespace media {
 
 class DecoderBuffer;
-class ContentDecryptionModule;
 class MojoDecoderBufferReader;
 class MojoDecoderBufferWriter;
 
@@ -33,14 +32,11 @@ class MEDIA_MOJO_EXPORT MojoDecryptorService
   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| remains around as long as this
+  // object.

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

nit: ensure that |decryptor| outlives |this|.

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

Done.

+  MojoDecryptorService(media::Decryptor* decryptor,
                        mojo::InterfaceRequest<mojom::Decryptor> request,
                        const base::Closure& error_handler);
 
@@ -106,9 +102,6 @@ class MEDIA_MOJO_EXPORT MojoDecryptorService
   // 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_;