media: Reject pending CDM promise during destruction.

chromecast/media/cdm/browser_cdm_cast.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 "chromecast/media/cdm/browser_cdm_cast.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 11 matching lines @@
 // media::CdmPromiseTemplate implementation that wraps a promise so as to
 // allow passing to other threads.
 template <typename... T>
 class CdmPromiseInternal : public ::media::CdmPromiseTemplate<T...> {
  public:
   CdmPromiseInternal(scoped_ptr<::media::CdmPromiseTemplate<T...>> promise)
       : task_runner_(base::ThreadTaskRunnerHandle::Get()),
         promise_(std::move(promise)) {}
 
   ~CdmPromiseInternal() final {
-    // Promise must be resolved or rejected before destruction.
-    DCHECK(!promise_);
+    if (IsPromiseSettled())
+      return;
+
+    DCHECK(promise_);
+    RejectPromiseOnDestruction();
   }
 
   // CdmPromiseTemplate<> implementation.
   void resolve(const T&... result) final;
 
   void reject(::media::MediaKeys::Exception exception,
               uint32_t system_code,
               const std::string& error_message) final {
     MarkPromiseSettled();
     task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&::media::CdmPromiseTemplate<T...>::reject,
                    base::Owned(promise_.release()),
                    exception, system_code, error_message));
   }
 
  private:
+  using ::media::CdmPromiseTemplate<T...>::IsPromiseSettled;
   using ::media::CdmPromiseTemplate<T...>::MarkPromiseSettled;
+  using ::media::CdmPromiseTemplate<T...>::RejectPromiseOnDestruction;
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   scoped_ptr<::media::CdmPromiseTemplate<T...>> promise_;
 };
 
 template <typename... T>
 void CdmPromiseInternal<T...>::resolve(const T&... result) {
   MarkPromiseSettled();
   task_runner_->PostTask(
       FROM_HERE,
@@ skipping 170 matching lines @@
       base::Passed(BindPromiseToCurrentLoop(std::move(promise))));
 }
 
 // A default empty implementation for subclasses that don't need to provide
 // any key system specific initialization.
 void BrowserCdmCast::InitializeInternal() {
 }
 
 }  // namespace media
 }  // namespace chromecast