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

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

Issue 1544313002: Convert Pass()→std::move() in //media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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_factory.cc ('k') | media/mojo/services/mojo_cdm_service.cc » ('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 6fa1a5accb46d7e132f2fbf2de4ff774bed3d59d..25131b2115a3bcb27f4baca3cdcb21c1fcb86e52 100644
--- a/media/mojo/services/mojo_cdm_promise.cc
+++ b/media/mojo/services/mojo_cdm_promise.cc
@@ -5,6 +5,7 @@
#include "media/mojo/services/mojo_cdm_promise.h"
#include <string>
+#include <utility>
#include <vector>
#include "base/bind.h"
@@ -25,7 +26,7 @@ static interfaces::CdmPromiseResultPtr GetRejectResult(
static_cast<interfaces::CdmException>(exception);
cdm_promise_result->system_code = system_code;
cdm_promise_result->error_message = error_message;
- return cdm_promise_result.Pass();
+ return cdm_promise_result;
}
template <typename... T>
@@ -47,7 +48,7 @@ void MojoCdmPromise<T...>::resolve(const T&... result) {
interfaces::CdmPromiseResult::New());
cdm_promise_result->success = true;
callback_.Run(
- cdm_promise_result.Pass(),
+ std::move(cdm_promise_result),
mojo::TypeConverter<typename MojoTypeTrait<T>::MojoType, T>::Convert(
result)...);
callback_.reset();
« no previous file with comments | « media/mojo/services/mojo_cdm_factory.cc ('k') | media/mojo/services/mojo_cdm_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698