[eme] Reject CDM calls after connection error

media/mojo/clients/mojo_cdm.cc

 // 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.
 
 #include "media/mojo/clients/mojo_cdm.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 94 matching lines @@
 
   // If connection error has happened, fail immediately.
   if (remote_cdm_.encountered_error()) {
     LOG(ERROR) << "Remote CDM encountered error.";
     promise->reject(CdmPromise::NOT_SUPPORTED_ERROR, 0,
                     "Mojo CDM creation failed.");
     return;
   }
 
   // Otherwise, set an error handler to catch the connection error.
+  DCHECK(remote_cdm_.is_bound());
   remote_cdm_.set_connection_error_with_reason_handler(
       base::Bind(&MojoCdm::OnConnectionError, base::Unretained(this)));
 
   pending_init_promise_ = std::move(promise);
 
   remote_cdm_->Initialize(
       key_system, security_origin.spec(), mojom::CdmConfig::From(cdm_config),
       base::Bind(&MojoCdm::OnCdmInitialized, base::Unretained(this)));
 }
 
-// TODO(xhwang): Properly handle CDM calls after connection error.
-// See http://crbug.com/671362
 void MojoCdm::OnConnectionError(uint32_t custom_reason,
                                 const std::string& description) {
   LOG(ERROR) << "Remote CDM connection error: custom_reason=" << custom_reason
              << ", description=\"" << description << "\"";
   DCHECK(thread_checker_.CalledOnValidThread());
 
+  remote_cdm_.reset();
+  DCHECK(!remote_cdm_.is_bound());
+
   // Handle initial connection error.
   if (pending_init_promise_) {
     DCHECK(!cdm_session_tracker_.HasRemainingSessions());
     pending_init_promise_->reject(CdmPromise::NOT_SUPPORTED_ERROR, 0,
                                   "Mojo CDM creation failed.");
     // Dropping the promise could cause |this| to be destructed.
     pending_init_promise_.reset();
     return;
   }
 
   cdm_session_tracker_.CloseRemainingSessions(session_closed_cb_);
 }
 
 void MojoCdm::SetServerCertificate(const std::vector<uint8_t>& certificate,
                                    std::unique_ptr<SimpleCdmPromise> promise) {
   DVLOG(2) << __func__;
   DCHECK(thread_checker_.CalledOnValidThread());
 
+  if (!remote_cdm_.is_bound()) {

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

will this work?

if (!remote_cdm_) {
  ...
}

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

Done.

+    promise->reject(media::CdmPromise::INVALID_STATE_ERROR, 0,
+                    "CDM has failed.");

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

This message will be received by JS app, so it'd be nice to have more details.
How about:

CDM connection lost

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

Done.

+    return;
+  }
+
   remote_cdm_->SetServerCertificate(
       certificate, base::Bind(&MojoCdm::OnSimpleCdmPromiseResult,
                               base::Unretained(this), base::Passed(&promise)));
 }
 
 void MojoCdm::CreateSessionAndGenerateRequest(
     SessionType session_type,
     EmeInitDataType init_data_type,
     const std::vector<uint8_t>& init_data,
     std::unique_ptr<NewSessionCdmPromise> promise) {
   DVLOG(2) << __func__;
   DCHECK(thread_checker_.CalledOnValidThread());
 
+  if (!remote_cdm_.is_bound()) {
+    promise->reject(media::CdmPromise::INVALID_STATE_ERROR, 0,
+                    "CDM has failed.");
+    return;
+  }
+
   remote_cdm_->CreateSessionAndGenerateRequest(
       session_type, init_data_type, init_data,
       base::Bind(&MojoCdm::OnNewSessionCdmPromiseResult, base::Unretained(this),
                  base::Passed(&promise)));
 }
 
 void MojoCdm::LoadSession(SessionType session_type,
                           const std::string& session_id,
                           std::unique_ptr<NewSessionCdmPromise> promise) {
   DVLOG(2) << __func__;
   DCHECK(thread_checker_.CalledOnValidThread());
 
+  if (!remote_cdm_.is_bound()) {
+    promise->reject(media::CdmPromise::INVALID_STATE_ERROR, 0,
+                    "CDM has failed.");
+    return;
+  }
+
   remote_cdm_->LoadSession(
       session_type, session_id,
       base::Bind(&MojoCdm::OnNewSessionCdmPromiseResult, base::Unretained(this),
                  base::Passed(&promise)));
 }
 
 void MojoCdm::UpdateSession(const std::string& session_id,
                             const std::vector<uint8_t>& response,
                             std::unique_ptr<SimpleCdmPromise> promise) {
   DVLOG(2) << __func__;
   DCHECK(thread_checker_.CalledOnValidThread());
 
+  if (!remote_cdm_.is_bound()) {
+    promise->reject(media::CdmPromise::INVALID_STATE_ERROR, 0,
+                    "CDM has failed.");
+    return;
+  }
+
   remote_cdm_->UpdateSession(
       session_id, response,
       base::Bind(&MojoCdm::OnSimpleCdmPromiseResult, base::Unretained(this),
                  base::Passed(&promise)));
 }
 
 void MojoCdm::CloseSession(const std::string& session_id,
                            std::unique_ptr<SimpleCdmPromise> promise) {
   DVLOG(2) << __func__;
   DCHECK(thread_checker_.CalledOnValidThread());
 
+  if (!remote_cdm_.is_bound()) {
+    promise->reject(media::CdmPromise::INVALID_STATE_ERROR, 0,
+                    "CDM has failed.");
+    return;
+  }
+
   remote_cdm_->CloseSession(
       session_id, base::Bind(&MojoCdm::OnSimpleCdmPromiseResult,
                              base::Unretained(this), base::Passed(&promise)));
 }
 
 void MojoCdm::RemoveSession(const std::string& session_id,
                             std::unique_ptr<SimpleCdmPromise> promise) {
   DVLOG(2) << __func__;
   DCHECK(thread_checker_.CalledOnValidThread());
 
+  if (!remote_cdm_.is_bound()) {
+    promise->reject(media::CdmPromise::INVALID_STATE_ERROR, 0,
+                    "CDM has failed.");
+    return;
+  }
+
   remote_cdm_->RemoveSession(
       session_id, base::Bind(&MojoCdm::OnSimpleCdmPromiseResult,
                              base::Unretained(this), base::Passed(&promise)));
 }
 
 CdmContext* MojoCdm::GetCdmContext() {
   DVLOG(2) << __func__;
   return this;
 }
 
@@ skipping 125 matching lines @@
     mojom::CdmPromiseResultPtr result,
     const std::string& session_id) {
   if (result->success) {
     cdm_session_tracker_.AddSession(session_id);
     promise->resolve(session_id);
   } else
     RejectPromise(std::move(promise), std::move(result));
 }
 
 }  // namespace media