[Android WebView] Call shouldInterceptRequest on a background thread

android_webview/browser/net/aw_stream_reader_job_delegate_impl.h

Index: android_webview/browser/net/aw_stream_reader_job_delegate_impl.h
diff --git a/android_webview/browser/aw_web_resource_response.cc b/android_webview/browser/net/aw_stream_reader_job_delegate_impl.h
similarity index 35%
rename from android_webview/browser/aw_web_resource_response.cc
rename to android_webview/browser/net/aw_stream_reader_job_delegate_impl.h
index 44f2aa87abdc9d2a3ea170d1c7c3cfc6d400cac5..1ec6ac1e5a7e2cd9de7222a33ba34fa20851928c 100644
--- a/android_webview/browser/aw_web_resource_response.cc
+++ b/android_webview/browser/net/aw_stream_reader_job_delegate_impl.h
@@ -1,86 +1,42 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2015 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/aw_web_resource_response.h"
+#ifndef ANDROID_WEBVIEW_BROWSER_NET_AW_STREAM_READER_JOB_DELEGATE_IMPL_H_
+#define ANDROID_WEBVIEW_BROWSER_NET_AW_STREAM_READER_JOB_DELEGATE_IMPL_H_
 
-#include "android_webview/browser/input_stream.h"
 #include "android_webview/browser/net/android_stream_reader_url_request_job.h"
-#include "base/strings/string_number_conversions.h"
-#include "net/http/http_response_headers.h"
+#include "android_webview/browser/net/aw_web_resource_response.h"
+#include "base/memory/scoped_ptr.h"
 
 namespace android_webview {
 
-namespace {
-
-class StreamReaderJobDelegateImpl
+class AwStreamReaderJobDelegateImpl
     : public AndroidStreamReaderURLRequestJob::Delegate {
  public:
-  StreamReaderJobDelegateImpl(
-      scoped_ptr<AwWebResourceResponse> aw_web_resource_response)
-      : aw_web_resource_response_(aw_web_resource_response.Pass()) {
-    DCHECK(aw_web_resource_response_);
-  }
+  AwStreamReaderJobDelegateImpl(
+      scoped_ptr<AwWebResourceResponse> aw_web_resource_response);
+  ~AwStreamReaderJobDelegateImpl() override;
 
   scoped_ptr<InputStream> OpenInputStream(JNIEnv* env,
-                                          const GURL& url) override {
-    return aw_web_resource_response_->GetInputStream(env).Pass();
-  }
-
+                                          const GURL& url) override;
   void OnInputStreamOpenFailed(net::URLRequest* request,
-                               bool* restart) override {
-    *restart = false;
-  }
-
+                               bool* restart) override;
   bool GetMimeType(JNIEnv* env,
                    net::URLRequest* request,
                    android_webview::InputStream* stream,
-                   std::string* mime_type) override {
-    return aw_web_resource_response_->GetMimeType(env, mime_type);
-  }
-
+                   std::string* mime_type) override;
   bool GetCharset(JNIEnv* env,
                   net::URLRequest* request,
                   android_webview::InputStream* stream,
-                  std::string* charset) override {
-    return aw_web_resource_response_->GetCharset(env, charset);
-  }
-
+                  std::string* charset) override;
   void AppendResponseHeaders(JNIEnv* env,
-                             net::HttpResponseHeaders* headers) override {
-    int status_code;
-    std::string reason_phrase;
-    if (aw_web_resource_response_->GetStatusInfo(
-            env, &status_code, &reason_phrase)) {
-      std::string status_line("HTTP/1.1 ");
-      status_line.append(base::IntToString(status_code));
-      status_line.append(" ");
-      status_line.append(reason_phrase);
-      headers->ReplaceStatusLine(status_line);
-    }
-    aw_web_resource_response_->GetResponseHeaders(env, headers);
-  }
+                             net::HttpResponseHeaders* headers) override;
 
  private:
   scoped_ptr<AwWebResourceResponse> aw_web_resource_response_;
 };
 
-}  // namespace
-
-// static
-net::URLRequestJob* AwWebResourceResponse::CreateJobFor(
-    scoped_ptr<AwWebResourceResponse> aw_web_resource_response,
-    net::URLRequest* request,
-    net::NetworkDelegate* network_delegate) {
-  DCHECK(aw_web_resource_response);
-  DCHECK(request);
-  DCHECK(network_delegate);
-
-  return new AndroidStreamReaderURLRequestJob(
-      request,
-      network_delegate,
-      make_scoped_ptr(
-          new StreamReaderJobDelegateImpl(aw_web_resource_response.Pass())));
-}
-
 }  // namespace android_webview
+
+#endif  // ANDROID_WEBVIEW_BROWSER_NET_AW_STREAM_READER_JOB_DELEGATE_IMPL_H_