[eme] Reject CDM calls after connection error

media/mojo/clients/mojo_cdm.h

Index: media/mojo/clients/mojo_cdm.h
diff --git a/media/mojo/clients/mojo_cdm.h b/media/mojo/clients/mojo_cdm.h
index 0971c627b508bde544f0da90b600fa08791532e0..0d2b7f4d8174b9c06e66ec7378cdbc6815162d4d 100644
--- a/media/mojo/clients/mojo_cdm.h
+++ b/media/mojo/clients/mojo_cdm.h
@@ -17,6 +17,7 @@
 #include "base/threading/thread_checker.h"
 #include "media/base/cdm_context.h"
 #include "media/base/cdm_initialized_promise.h"
+#include "media/base/cdm_promise_adapter.h"
 #include "media/base/cdm_session_tracker.h"
 #include "media/base/media_keys.h"
 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
@@ -113,12 +114,11 @@ class MojoCdm : public MediaKeys,
   void OnKeyAdded();
 
   // Callbacks to handle CDM promises.
-  void OnSimpleCdmPromiseResult(std::unique_ptr<SimpleCdmPromise> promise,
+  void OnSimpleCdmPromiseResult(uint32_t promise_id,
                                 mojom::CdmPromiseResultPtr result);
-  void OnNewSessionCdmPromiseResult(
-      std::unique_ptr<NewSessionCdmPromise> promise,
-      mojom::CdmPromiseResultPtr result,
-      const std::string& session_id);
+  void OnNewSessionCdmPromiseResult(uint32_t promise_id,
+                                    mojom::CdmPromiseResultPtr result,
+                                    const std::string& session_id);
 
   base::ThreadChecker thread_checker_;
 
@@ -157,6 +157,9 @@ class MojoCdm : public MediaKeys,
   // Keep track of current sessions.
   CdmSessionTracker cdm_session_tracker_;
 
+  // Keep track of outstanding promises.
+  CdmPromiseAdapter cdm_promise_adapter_;
+
   // This must be the last member.
   base::WeakPtrFactory<MojoCdm> weak_factory_;