[WebView] Replace AwContentsIoThreadClient, InputStream and AwWebResourceResponse

android_webview/browser/input_stream.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 "android_webview/browser/input_stream_impl.h"
+#include "android_webview/browser/input_stream.h"
 
 #include "base/android/jni_android.h"
 // Disable "Warnings treated as errors" for input_stream_jni as it's a Java
 // system class and we have to generate C++ hooks for all methods in the class
 // even if they're unused.
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-function"
 #include "jni/InputStreamUtil_jni.h"
 #pragma GCC diagnostic pop
 #include "net/base/io_buffer.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ClearException;
 using base::android::JavaRef;
 
 namespace android_webview {
 
 namespace {
 
 // This should be the same as InputStramUtil.EXCEPTION_THROWN_STATUS.
 const int kExceptionThrownStatusCode = -2;
 }
 
 // Maximum number of bytes to be read in a single read.
-const int InputStreamImpl::kBufferSize = 4096;
-
-// static
-const InputStreamImpl* InputStreamImpl::FromInputStream(
-    const InputStream* input_stream) {
-  return static_cast<const InputStreamImpl*>(input_stream);
-}
+const int InputStream::kBufferSize = 4096;
 
 // TODO: Use unsafe version for all Java_InputStream methods in this file
 // once BUG 157880 is fixed and implement graceful exception handling.
 
-InputStreamImpl::InputStreamImpl() {}
+InputStream::InputStream() {}
 
-InputStreamImpl::InputStreamImpl(const JavaRef<jobject>& stream)
-    : jobject_(stream) {
+InputStream::InputStream(const JavaRef<jobject>& stream) : jobject_(stream) {
   DCHECK(!stream.is_null());
 }
 
-InputStreamImpl::~InputStreamImpl() {
+InputStream::~InputStream() {
   JNIEnv* env = AttachCurrentThread();
-  Java_InputStreamUtil_close(env, jobject_);
+  if (jobject_.obj())
+    Java_InputStreamUtil_close(env, jobject_);
 }
 
-bool InputStreamImpl::BytesAvailable(int* bytes_available) const {
+bool InputStream::BytesAvailable(int* bytes_available) const {
   JNIEnv* env = AttachCurrentThread();
   int bytes = Java_InputStreamUtil_available(env, jobject_);
   if (bytes == kExceptionThrownStatusCode)
     return false;
   *bytes_available = bytes;
   return true;
 }
 
-bool InputStreamImpl::Skip(int64_t n, int64_t* bytes_skipped) {
+bool InputStream::Skip(int64_t n, int64_t* bytes_skipped) {
   JNIEnv* env = AttachCurrentThread();
   int bytes = Java_InputStreamUtil_skip(env, jobject_, n);
   if (bytes < 0)
     return false;
   if (bytes > n)
     return false;
   *bytes_skipped = bytes;
   return true;
 }
 
-bool InputStreamImpl::Read(net::IOBuffer* dest, int length, int* bytes_read) {
+bool InputStream::Read(net::IOBuffer* dest, int length, int* bytes_read) {
   JNIEnv* env = AttachCurrentThread();
   if (!buffer_.obj()) {
     // Allocate transfer buffer.
     base::android::ScopedJavaLocalRef<jbyteArray> temp(
         env, env->NewByteArray(kBufferSize));
     buffer_.Reset(temp);
     if (ClearException(env))
       return false;
   }
 
@@ skipping 36 matching lines @@
     dest_write_ptr += transfer_length;
   }
   // bytes_read can be strictly less than the req. length if EOF is encountered.
   DCHECK_GE(remaining_length, 0);
   DCHECK_LE(remaining_length, length);
   *bytes_read = length - remaining_length;
   return true;
 }
 
 }  // namespace android_webview