Speculative revert to see if this clears up the http://build.chromium.org/p/chromium.linux/waterfall?builder=Android%20Tests

failures. Will reland if this does not do the trick

Revert 201561 "Android: Implement JavaFloatArrayToFloatVector"

> Android: Implement JavaFloatArrayToFloatVector
> 
> The JNI interface was missing a way to convert float collections from Java to
> CC, which is needed by Android's Web Speech API to return confidence scores of
> speech recognition results. Added tests for float and int collections.
> 
> TEST=JniArray.JavaFloatArrayToFloatVector and JniArray.JavaIntArrayToIntVector
> 
> Review URL: https://chromiumcodereview.appspot.com/15467003

TBR=janx@chromium.org

Review URL: https://codereview.chromium.org/15691003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201604 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 54 deletions

diff --git a/base/android/jni_array_unittest.cc b/base/android/jni_array_unittest.cc
index 3ac7855..bc497a8 100644
--- a/base/android/jni_array_unittest.cc
+++ b/base/android/jni_array_unittest.cc
@@ -35,7 +35,7 @@ void CheckLongConversion(
   ASSERT_TRUE(longs.obj());
 
   jsize java_array_len = env->GetArrayLength(longs.obj());
-  ASSERT_EQ(static_cast<jsize>(len), java_array_len);
+  ASSERT_EQ(static_cast<int>(len), java_array_len);
 
   jlong value;
   for (size_t i = 0; i < len; ++i) {
@@ -55,59 +55,6 @@ TEST(JniArray, LongConversions) {
   CheckLongConversion(env, kLongs, kLen, ToJavaLongArray(env, vec));
 }
 
-TEST(JniArray, JavaIntArrayToIntVector) {
-  const int kInts[] = {0, 1, -1};
-  const size_t kLen = arraysize(kInts);
-
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jintArray> jints(env, env->NewIntArray(kLen));
-  ASSERT_TRUE(jints.obj());
-
-  for (size_t i = 0; i < kLen; ++i) {
-    jint j = static_cast<jint>(kInts[i]);
-    env->SetIntArrayRegion(jints.obj(), i, 1, &j);
-    ASSERT_FALSE(HasException(env));
-  }
-
-  std::vector<int> ints;
-  JavaIntArrayToIntVector(env, jints.obj(), &ints);
-
-  ASSERT_EQ(static_cast<jsize>(ints.size()), env->GetArrayLength(jints.obj()));
-
-  jint value;
-  for (size_t i = 0; i < kLen; ++i) {
-    env->GetIntArrayRegion(jints.obj(), i, 1, &value);
-    ASSERT_EQ(ints[i], value);
-  }
-}
-
-TEST(JniArray, JavaFloatArrayToFloatVector) {
-  const float kFloats[] = {0.0, 0.5, -0.5};
-  const size_t kLen = arraysize(kFloats);
-
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jfloatArray> jfloats(env, env->NewFloatArray(kLen));
-  ASSERT_TRUE(jfloats.obj());
-
-  for (size_t i = 0; i < kLen; ++i) {
-    jfloat j = static_cast<jfloat>(kFloats[i]);
-    env->SetFloatArrayRegion(jfloats.obj(), i, 1, &j);
-    ASSERT_FALSE(HasException(env));
-  }
-
-  std::vector<float> floats;
-  JavaFloatArrayToFloatVector(env, jfloats.obj(), &floats);
-
-  ASSERT_EQ(static_cast<jsize>(floats.size()),
-      env->GetArrayLength(jfloats.obj()));
-
-  jfloat value;
-  for (size_t i = 0; i < kLen; ++i) {
-    env->GetFloatArrayRegion(jfloats.obj(), i, 1, &value);
-    ASSERT_EQ(floats[i], value);
-  }
-}
-
 TEST(JniArray, JavaArrayOfByteArrayToStringVector) {
   const int kMaxItems = 50;
   JNIEnv* env = AttachCurrentThread();