Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2207)

Unified Diff: media/mojo/services/mojo_cdm_promise.cc

Issue 2411573002: media: Use new wrapper types for media mojo interfaces (Closed)
Patch Set: comments addressed Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/mojo/services/mojo_cdm_promise.h ('k') | media/mojo/services/mojo_cdm_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « media/mojo/services/mojo_cdm_promise.h ('k') | media/mojo/services/mojo_cdm_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698