Change MojoDecryptorService to take a Decryptor

media/mojo/services/mojo_cdm_service.h

 // Copyright 2014 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_CDM_SERVICE_H_
 #define MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 88 matching lines @@
   // CDM ID to be assigned to the next successfully initialized CDM. This ID is
   // unique per process. It will be used to locate the CDM by the media players
   // living in the same process.
   static int next_cdm_id_;
 
   base::WeakPtr<MojoCdmServiceContext> context_;
 
   CdmFactory* cdm_factory_;
   scoped_refptr<::media::ContentDecryptionModule> cdm_;
 
+  // MojoDecryptorService will be passed the Decryptor from |cdm_|, so

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

nit: "will be passed the Decryptor"?

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

Done.

+  // |decryptor_| must not outlive |cdm_|.
   std::unique_ptr<MojoDecryptorService> decryptor_;
 
   // Set to a valid CDM ID if the |cdm_| is successfully created.
   int cdm_id_;
 
   mojom::ContentDecryptionModuleClientPtr client_;
 
   base::WeakPtr<MojoCdmService> weak_this_;
   base::WeakPtrFactory<MojoCdmService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoCdmService);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_H_