| Index: media/base/android/media_drm_bridge.cc
|
| diff --git a/media/base/android/media_drm_bridge.cc b/media/base/android/media_drm_bridge.cc
|
| index f3ba95dbcfafb7b6c848342304bebda38893d604..5a29acd2494a8d2bc202dee386610a36ed02abc4 100644
|
| --- a/media/base/android/media_drm_bridge.cc
|
| +++ b/media/base/android/media_drm_bridge.cc
|
| @@ -5,8 +5,8 @@
|
| #include "media/base/android/media_drm_bridge.h"
|
|
|
| #include <stddef.h>
|
| -
|
| #include <algorithm>
|
| +#include <utility>
|
|
|
| #include "base/android/build_info.h"
|
| #include "base/android/jni_array.h"
|
| @@ -29,7 +29,6 @@
|
| #include "media/base/android/media_drm_bridge_delegate.h"
|
| #include "media/base/android/provision_fetcher.h"
|
| #include "media/base/cdm_key_information.h"
|
| -
|
| #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
|
|
|
| using base::android::AttachCurrentThread;
|
| @@ -365,7 +364,7 @@ void MediaDrmBridge::CreateSessionAndGenerateRequest(
|
|
|
| ScopedJavaLocalRef<jstring> j_mime =
|
| ConvertUTF8ToJavaString(env, ConvertInitDataType(init_data_type));
|
| - uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
|
| + uint32_t promise_id = cdm_promise_adapter_.SavePromise(std::move(promise));
|
| Java_MediaDrmBridge_createSessionFromNative(
|
| env, j_media_drm_.obj(), j_init_data.obj(), j_mime.obj(),
|
| j_optional_parameters.obj(), promise_id);
|
| @@ -393,7 +392,7 @@ void MediaDrmBridge::UpdateSession(
|
| ScopedJavaLocalRef<jbyteArray> j_session_id = base::android::ToJavaByteArray(
|
| env, reinterpret_cast<const uint8_t*>(session_id.data()),
|
| session_id.size());
|
| - uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
|
| + uint32_t promise_id = cdm_promise_adapter_.SavePromise(std::move(promise));
|
| Java_MediaDrmBridge_updateSession(env, j_media_drm_.obj(), j_session_id.obj(),
|
| j_response.obj(), promise_id);
|
| }
|
| @@ -406,7 +405,7 @@ void MediaDrmBridge::CloseSession(const std::string& session_id,
|
| ScopedJavaLocalRef<jbyteArray> j_session_id = base::android::ToJavaByteArray(
|
| env, reinterpret_cast<const uint8_t*>(session_id.data()),
|
| session_id.size());
|
| - uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
|
| + uint32_t promise_id = cdm_promise_adapter_.SavePromise(std::move(promise));
|
| Java_MediaDrmBridge_closeSession(env, j_media_drm_.obj(), j_session_id.obj(),
|
| promise_id);
|
| }
|
|
|