Renamed JavaInputStreamWrapper to JavaISWrapper

The linker confused this class with another class
in WebKit with the same name. This caused a crash
in the CTS tests.

Change-Id: I6fbdd105d24d27496ae8c26a7028c0f9e19bb485

2 files changed, 6 insertions, 6 deletions

diff --git a/android/jni/platform_file_jni.cc b/android/jni/platform_file_jni.cc
index 658b417..d713d23 100644
--- a/android/jni/platform_file_jni.cc
+++ b/android/jni/platform_file_jni.cc
@@ -9,7 +9,7 @@
 
 namespace android {
 
-JavaInputStreamWrapper::JavaInputStreamWrapper(const FilePath& path) {
+JavaISWrapper::JavaISWrapper(const FilePath& path) {
   JNIEnv* env = GetJNIEnv();
   jclass inputStreamClass = env->FindClass("java/io/InputStream");
   m_read = env->GetMethodID(inputStreamClass, "read", "([B)I");
@@ -28,14 +28,14 @@ JavaInputStreamWrapper::JavaInputStreamWrapper(const FilePath& path) {
   env->DeleteLocalRef(inputStreamClass);
 }
 
-JavaInputStreamWrapper::~JavaInputStreamWrapper() {
+JavaISWrapper::~JavaISWrapper() {
   JNIEnv* env = GetJNIEnv();
   env->CallVoidMethod(m_inputStream, m_close);
   CheckException(env);
   env->DeleteGlobalRef(m_inputStream);
 }
 
-int JavaInputStreamWrapper::Read(char* out, int length) {
+int JavaISWrapper::Read(char* out, int length) {
   JNIEnv* env = GetJNIEnv();
   jbyteArray buffer = env->NewByteArray(length);
 
diff --git a/android/jni/platform_file_jni.h b/android/jni/platform_file_jni.h
index dd4254a..89232a5 100644
--- a/android/jni/platform_file_jni.h
+++ b/android/jni/platform_file_jni.h
@@ -11,10 +11,10 @@ namespace android {
 
 uint64 contentUrlSize(const FilePath& name);
 
-class JavaInputStreamWrapper {
+class JavaISWrapper {
 public:
-  JavaInputStreamWrapper(const FilePath& path);
-  ~JavaInputStreamWrapper();
+  JavaISWrapper(const FilePath& path);
+  ~JavaISWrapper();
 
   int Read(char* out, int length);