media: Add External Clear Key content browser test on Android

media/mojo/clients/mojo_cdm.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_CLIENTS_MOJO_CDM_H_
 #define MEDIA_MOJO_CLIENTS_MOJO_CDM_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 122 matching lines @@
 
   // Protects |cdm_id_|, |decryptor_ptr_|, |decryptor_| and
   // |decryptor_task_runner_| which could be accessed from other threads.
   // See CdmContext implementation above.
   mutable base::Lock lock_;
 
   // CDM ID of the remote CDM. Set after initialization is completed. Must not
   // be invalid if initialization succeeded.
   int cdm_id_;
 
-  // The DecryptorPtr exposed by the remote CDM. Set after initialization is
-  // completed and cleared after |decryptor_| is created. May be null after
-  // initialization if the CDM doesn't support a Decryptor.
-  mojom::DecryptorPtr decryptor_ptr_;
+  // The DecryptorPtrInfo exposed by the remote CDM. Set after initialization
+  // is completed and cleared after |decryptor_| is created. May be invalid
+  // after initialization if the CDM doesn't support a Decryptor.
+  mojom::DecryptorPtrInfo decryptor_ptr_info_;
 
   // Decryptor based on |decryptor_ptr_|, lazily created in GetDecryptor().
   // Since GetDecryptor() can be called on a different thread, use
   // |decryptor_task_runner_| to bind |decryptor_| to that thread.
   std::unique_ptr<MojoDecryptor> decryptor_;
   scoped_refptr<base::SingleThreadTaskRunner> decryptor_task_runner_;
 
   // Callbacks for firing session events.
   SessionMessageCB session_message_cb_;
   SessionClosedCB session_closed_cb_;
   SessionKeysChangeCB session_keys_change_cb_;
   SessionExpirationUpdateCB session_expiration_update_cb_;
 
   // Pending promise for InitializeCdm().
   std::unique_ptr<CdmInitializedPromise> pending_init_promise_;
 
   // This must be the last member.
   base::WeakPtrFactory<MojoCdm> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoCdm);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_CLIENTS_MOJO_CDM_H_