Update from https://crrev.com/311076

base/android/jni_array.h

 // 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.
 
 #ifndef BASE_ANDROID_JNI_ARRAY_H_
 #define BASE_ANDROID_JNI_ARRAY_H_
 
 #include <jni.h>
 #include <string>
 #include <vector>
@@ skipping 59 matching lines @@
 // Replaces the content of |out| with the Java ints in |int_array|.
 BASE_EXPORT void JavaIntArrayToIntVector(
     JNIEnv* env,
     jintArray int_array,
     std::vector<int>* out);
 
 // Replaces the content of |out| with the Java longs in |long_array|.
 BASE_EXPORT void JavaLongArrayToLongVector(
     JNIEnv* env,
     jlongArray long_array,
-    std::vector<long>* out);
+    std::vector<jlong>* out);
 
 // Replaces the content of |out| with the Java floats in |float_array|.
 BASE_EXPORT void JavaFloatArrayToFloatVector(
     JNIEnv* env,
     jfloatArray float_array,
     std::vector<float>* out);
 
 // Assuming |array| is an byte[][] (array of byte arrays), replaces the
 // content of |out| with the corresponding vector of strings. No UTF-8
 // conversion is performed.
 BASE_EXPORT void JavaArrayOfByteArrayToStringVector(
     JNIEnv* env,
     jobjectArray array,
     std::vector<std::string>* out);
 
 }  // namespace android
 }  // namespace base
 
 #endif  // BASE_ANDROID_JNI_ARRAY_H_