Update from https://crrev.com/316786

base/android/jni_array.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/android/jni_array.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
 
 namespace base {
 namespace android {
 namespace {
 
 // As |GetArrayLength| makes no guarantees about the returned value (e.g., it
 // may be -1 if |array| is not a valid Java array), provide a safe wrapper
 // that always returns a valid, non-negative size.
 template <typename JavaArrayType>
 size_t SafeGetArrayLength(JNIEnv* env, JavaArrayType jarray) {
@@ skipping 26 matching lines @@
 
   env->SetIntArrayRegion(
       int_array, 0, len, reinterpret_cast<const jint*>(ints));
   CheckException(env);
 
   return ScopedJavaLocalRef<jintArray>(env, int_array);
 }
 
 ScopedJavaLocalRef<jintArray> ToJavaIntArray(
     JNIEnv* env, const std::vector<int>& ints) {
-  return ToJavaIntArray(env, vector_as_array(&ints), ints.size());
+  return ToJavaIntArray(env, ints.begin(), ints.size());
 }
 
 ScopedJavaLocalRef<jlongArray> ToJavaLongArray(
     JNIEnv* env, const int64* longs, size_t len) {
   jlongArray long_array = env->NewLongArray(len);
   CheckException(env);
   DCHECK(long_array);
 
   env->SetLongArrayRegion(
       long_array, 0, len, reinterpret_cast<const jlong*>(longs));
   CheckException(env);
 
   return ScopedJavaLocalRef<jlongArray>(env, long_array);
 }
 
 // Returns a new Java long array converted from the given int64 array.
 BASE_EXPORT ScopedJavaLocalRef<jlongArray> ToJavaLongArray(
     JNIEnv* env, const std::vector<int64>& longs) {
-  return ToJavaLongArray(env, vector_as_array(&longs), longs.size());
+  return ToJavaLongArray(env, longs.begin(), longs.size());
 }
 
 ScopedJavaLocalRef<jobjectArray> ToJavaArrayOfByteArray(
     JNIEnv* env, const std::vector<std::string>& v) {
   ScopedJavaLocalRef<jclass> byte_array_clazz = GetClass(env, "[B");
   jobjectArray joa = env->NewObjectArray(v.size(),
                                          byte_array_clazz.obj(), NULL);
   CheckException(env);
 
   for (size_t i = 0; i < v.size(); ++i) {
@@ skipping 134 matching lines @@
             env->GetObjectArrayElement(array, i)));
     jsize bytes_len = env->GetArrayLength(bytes_array.obj());
     jbyte* bytes = env->GetByteArrayElements(bytes_array.obj(), NULL);
     (*out)[i].assign(reinterpret_cast<const char*>(bytes), bytes_len);
     env->ReleaseByteArrayElements(bytes_array.obj(), bytes, JNI_ABORT);
   }
 }
 
 }  // namespace android
 }  // namespace base