[android_webview] Don't block the IO thread when reading from an InputStream.

android_webview/native/intercepted_request_data_impl.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/native/intercepted_request_data_impl.h"
 
-#include "android_webview/native/android_stream_reader_url_request_job.h"
+#include "android_webview/browser/net/android_stream_reader_url_request_job.h"
+#include "android_webview/native/input_stream_impl.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "jni/InterceptedRequestData_jni.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 
 using base::android::ScopedJavaLocalRef;
 
 namespace android_webview {
 
 namespace {
 
 class StreamReaderJobDelegateImpl :
     public AndroidStreamReaderURLRequestJob::Delegate {
  public:
     StreamReaderJobDelegateImpl(
         const InterceptedRequestDataImpl* intercepted_request_data)
         : intercepted_request_data_impl_(intercepted_request_data) {
       DCHECK(intercepted_request_data_impl_);
     }
 
-    virtual base::android::ScopedJavaLocalRef<jobject> OpenInputStream(
+    virtual scoped_ptr<InputStream> OpenInputStream(
         JNIEnv* env,
         net::URLRequest* request) OVERRIDE {
-      return intercepted_request_data_impl_->GetInputStream(env);
+      return intercepted_request_data_impl_->GetInputStream(env).Pass();
     }
 
     virtual bool GetMimeType(JNIEnv* env,
                              net::URLRequest* request,
-                             jobject stream,
+                             const android_webview::InputStream& stream,
                              std::string* mime_type) OVERRIDE {
       return intercepted_request_data_impl_->GetMimeType(env, mime_type);
     }
 
     virtual bool GetCharset(JNIEnv* env,
                             net::URLRequest* request,
-                            jobject stream,
+                            const android_webview::InputStream& stream,
                             std::string* charset) OVERRIDE {
       return intercepted_request_data_impl_->GetCharset(env, charset);
     }
 
  private:
     const InterceptedRequestDataImpl* intercepted_request_data_impl_;
 };
 
 } // namespace
 
 InterceptedRequestDataImpl::InterceptedRequestDataImpl(
     const base::android::JavaRef<jobject>& obj)
   : java_object_(obj) {
 }
 
 InterceptedRequestDataImpl::~InterceptedRequestDataImpl() {
 }
 
-ScopedJavaLocalRef<jobject>
+scoped_ptr<InputStream>
 InterceptedRequestDataImpl::GetInputStream(JNIEnv* env) const {
-  return Java_InterceptedRequestData_getData(env, java_object_.obj());
+  ScopedJavaLocalRef<jobject> jstream =
+      Java_InterceptedRequestData_getData(env, java_object_.obj());
+  if (jstream.is_null())
+    return scoped_ptr<InputStream>();
+  return make_scoped_ptr<InputStream>(new InputStreamImpl(jstream));
 }
 
 bool InterceptedRequestDataImpl::GetMimeType(JNIEnv* env,
                                              std::string* mime_type) const {
   ScopedJavaLocalRef<jstring> jstring_mime_type =
       Java_InterceptedRequestData_getMimeType(env, java_object_.obj());
   if (jstring_mime_type.is_null())
     return false;
   *mime_type = ConvertJavaStringToUTF8(jstring_mime_type);
   return true;
@@ skipping 16 matching lines @@
 net::URLRequestJob* InterceptedRequestDataImpl::CreateJobFor(
     net::URLRequest* request,
     net::NetworkDelegate* network_delegate) const {
   scoped_ptr<AndroidStreamReaderURLRequestJob::Delegate>
       stream_reader_job_delegate_impl(new StreamReaderJobDelegateImpl(this));
   return new AndroidStreamReaderURLRequestJob(
       request, network_delegate, stream_reader_job_delegate_impl.Pass());
 }
 
 } // namespace android_webview