| Index: chromecast/media/cdm/browser_cdm_cast.cc
|
| diff --git a/chromecast/media/cdm/browser_cdm_cast.cc b/chromecast/media/cdm/browser_cdm_cast.cc
|
| index 380c3622b71c239169a4b98772ee907af4ea2a5b..e5585c5ac17de7d89ae83edfc7de172ba0c38580 100644
|
| --- a/chromecast/media/cdm/browser_cdm_cast.cc
|
| +++ b/chromecast/media/cdm/browser_cdm_cast.cc
|
| @@ -29,8 +29,11 @@ class CdmPromiseInternal : public ::media::CdmPromiseTemplate<T...> {
|
| promise_(std::move(promise)) {}
|
|
|
| ~CdmPromiseInternal() final {
|
| - // Promise must be resolved or rejected before destruction.
|
| - DCHECK(!promise_);
|
| + if (IsPromiseSettled())
|
| + return;
|
| +
|
| + DCHECK(promise_);
|
| + RejectPromiseOnDestruction();
|
| }
|
|
|
| // CdmPromiseTemplate<> implementation.
|
| @@ -48,7 +51,9 @@ class CdmPromiseInternal : public ::media::CdmPromiseTemplate<T...> {
|
| }
|
|
|
| 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_;
|
|
|