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

Unified Diff: media/base/android/media_drm_bridge.cc

Issue 1471043004: Convert various vector_as_array calls to vector::data. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « google_apis/gcm/base/socket_stream_unittest.cc ('k') | media/base/android/webaudio_media_codec_bridge.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f3ffc0f976e09568ec91d5515a5feeb9f0f8cbe4..9a07f2343792f7e19150ee8e3935c6b99826a236 100644
--- a/media/base/android/media_drm_bridge.cc
+++ b/media/base/android/media_drm_bridge.cc
@@ -16,7 +16,6 @@
#include "base/location.h"
#include "base/logging.h"
#include "base/single_thread_task_runner.h"
-#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/sys_byteorder.h"
@@ -341,9 +340,9 @@ void MediaDrmBridge::CreateSessionAndGenerateRequest(
promise->reject(INVALID_ACCESS_ERROR, 0, "Invalid init data.");
}
if (!init_data_from_delegate.empty()) {
- j_init_data = base::android::ToJavaByteArray(
- env, vector_as_array(&init_data_from_delegate),
- init_data_from_delegate.size());
+ j_init_data =
+ base::android::ToJavaByteArray(env, init_data_from_delegate.data(),
+ init_data_from_delegate.size());
}
if (!optional_parameters_from_delegate.empty()) {
j_optional_parameters = base::android::ToJavaArrayOfStrings(
@@ -353,8 +352,8 @@ void MediaDrmBridge::CreateSessionAndGenerateRequest(
}
if (j_init_data.is_null()) {
- j_init_data = base::android::ToJavaByteArray(
- env, vector_as_array(&init_data), init_data.size());
+ j_init_data =
+ base::android::ToJavaByteArray(env, init_data.data(), init_data.size());
}
ScopedJavaLocalRef<jstring> j_mime =
@@ -382,8 +381,8 @@ void MediaDrmBridge::UpdateSession(
DVLOG(2) << __FUNCTION__;
JNIEnv* env = AttachCurrentThread();
- ScopedJavaLocalRef<jbyteArray> j_response = base::android::ToJavaByteArray(
- env, vector_as_array(&response), response.size());
+ ScopedJavaLocalRef<jbyteArray> j_response =
+ base::android::ToJavaByteArray(env, response.data(), response.size());
ScopedJavaLocalRef<jbyteArray> j_session_id = base::android::ToJavaByteArray(
env, reinterpret_cast<const uint8_t*>(session_id.data()),
session_id.size());
« no previous file with comments | « google_apis/gcm/base/socket_stream_unittest.cc ('k') | media/base/android/webaudio_media_codec_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698