| Index: media/mojo/services/mojo_cdm_promise.cc
|
| diff --git a/media/mojo/services/mojo_cdm_promise.cc b/media/mojo/services/mojo_cdm_promise.cc
|
| index 4d37a99d8fa333cef041b77c567b8376ba4b782e..430360b326179a2196a23baa8a305eb872a10c83 100644
|
| --- a/media/mojo/services/mojo_cdm_promise.cc
|
| +++ b/media/mojo/services/mojo_cdm_promise.cc
|
| @@ -47,10 +47,7 @@ void MojoCdmPromise<T...>::resolve(const T&... result) {
|
| MarkPromiseSettled();
|
| mojom::CdmPromiseResultPtr cdm_promise_result(mojom::CdmPromiseResult::New());
|
| cdm_promise_result->success = true;
|
| - callback_.Run(
|
| - std::move(cdm_promise_result),
|
| - mojo::TypeConverter<typename MojoTypeTrait<T>::MojoType, T>::Convert(
|
| - result)...);
|
| + callback_.Run(std::move(cdm_promise_result), result...);
|
| callback_.Reset();
|
| }
|
|
|
| @@ -59,8 +56,7 @@ 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_.Run(GetRejectResult(exception, system_code, error_message), T()...);
|
| callback_.Reset();
|
| }
|
|
|
|
|