Use a direct include of strings headers in base/.

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>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace base {
 namespace android {
 
 // Returns a new Java byte array converted from the given bytes array.
 BASE_EXPORT ScopedJavaLocalRef<jbyteArray> ToJavaByteArray(
     JNIEnv* env, const uint8* bytes, size_t len);
 
 // Returns a new Java long array converted from the given int64 array.
 BASE_EXPORT ScopedJavaLocalRef<jlongArray> ToJavaLongArray(
@@ skipping 52 matching lines @@
 // 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_