[eme] Reject CDM calls after connection error

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 10 matching lines @@
 #include "media/base/media_keys.h"
 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace media {
 
+class MojoCdmTest;
 class MojoDecryptor;
 
 // A MediaKeys that proxies to a mojom::ContentDecryptionModule. That
 // mojom::ContentDecryptionModule proxies back to the MojoCdm via the
 // mojom::ContentDecryptionModuleClient interface.
 class MojoCdm : public MediaKeys,
                 public CdmContext,
                 public mojom::ContentDecryptionModuleClient {
  public:
   using MessageType = MediaKeys::MessageType;
@@ skipping 28 matching lines @@
   void RemoveSession(const std::string& session_id,
                      std::unique_ptr<SimpleCdmPromise> promise) final;
   CdmContext* GetCdmContext() final;
 
   // CdmContext implementation. Can be called on a different thread.
   // All GetDecryptor() calls must be made on the same thread.
   Decryptor* GetDecryptor() final;
   int GetCdmId() const final;
 
  private:
+  friend class MojoCdmTest;

[xhwang, 2016/12/09 06:13:30]

This is not needed, see below.

[jrummell, 2016/12/13 20:57:34]

Done.

+
   MojoCdm(mojom::ContentDecryptionModulePtr remote_cdm,
           const SessionMessageCB& session_message_cb,
           const SessionClosedCB& session_closed_cb,
           const SessionKeysChangeCB& session_keys_change_cb,
           const SessionExpirationUpdateCB& session_expiration_update_cb);
 
   ~MojoCdm() final;
 
   void InitializeCdm(const std::string& key_system,
                      const GURL& security_origin,
@@ skipping 70 matching lines @@
 
   // 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_