media: Reject pending CDM promise during destruction.

media/mojo/services/mojo_cdm_promise.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/services/mojo_cdm_promise.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 19 matching lines @@
 }
 
 template <typename... T>
 MojoCdmPromise<T...>::MojoCdmPromise(const CallbackType& callback)
     : callback_(callback) {
   DCHECK(!callback_.is_null());
 }
 
 template <typename... T>
 MojoCdmPromise<T...>::~MojoCdmPromise() {
-  if (!callback_.is_null())
-    DVLOG(1) << "Promise not resolved before destruction.";
+  if (IsPromiseSettled())
+    return;
+
+  DCHECK(!callback_.is_null());
+  RejectPromiseOnDestruction();
 }
 
 template <typename... T>
 void MojoCdmPromise<T...>::resolve(const T&... result) {
   MarkPromiseSettled();
   interfaces::CdmPromiseResultPtr cdm_promise_result(
       interfaces::CdmPromiseResult::New());
   cdm_promise_result->success = true;
   callback_.Run(
       std::move(cdm_promise_result),
       mojo::TypeConverter<typename MojoTypeTrait<T>::MojoType, T>::Convert(
           result)...);
   callback_.reset();
 }
 
 template <typename... T>
 void MojoCdmPromise<T...>::reject(MediaKeys::Exception exception,
                                   uint32_t system_code,
                                   const std::string& error_message) {
   MarkPromiseSettled();
   callback_.Run(GetRejectResult(exception, system_code, error_message),
                 MojoTypeTrait<T>::DefaultValue()...);
   callback_.reset();
 }
 
 template class MojoCdmPromise<>;
 template class MojoCdmPromise<std::string>;
 
 }  // namespace media