[Android WebView] Call shouldInterceptRequest on a background thread

Move the call to WebViewClient.shouldInterceptRequest from IO thread
to a background thread. This is in order to avoid situations when
embedder's code blocks inside shouldInterceptRequest callback, and
this effectively shuts down IPC messages processing.

BUG=533082
R=boliu@chromium.org, mmenke@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#351894}

1 files changed, 4 insertions, 2 deletions

diff --git a/android_webview/native/aw_contents_io_thread_client_impl.h b/android_webview/native/aw_contents_io_thread_client_impl.h
index 97ba314..01d8747b 100644
--- a/android_webview/native/aw_contents_io_thread_client_impl.h
+++ b/android_webview/native/aw_contents_io_thread_client_impl.h
@@ -47,8 +47,9 @@ class AwContentsIoThreadClientImpl : public AwContentsIoThreadClient {
   // Implementation of AwContentsIoThreadClient.
   bool PendingAssociation() const override;
   CacheMode GetCacheMode() const override;
-  scoped_ptr<AwWebResourceResponse> ShouldInterceptRequest(
-      const net::URLRequest* request) override;
+  void ShouldInterceptRequestAsync(
+      const net::URLRequest* request,
+      const ShouldInterceptRequestResultCallback callback) override;
   bool ShouldBlockContentUrls() const override;
   bool ShouldBlockFileUrls() const override;
   bool ShouldAcceptThirdPartyCookies() const override;
@@ -69,6 +70,7 @@ class AwContentsIoThreadClientImpl : public AwContentsIoThreadClient {
  private:
   bool pending_association_;
   base::android::ScopedJavaGlobalRef<jobject> java_object_;
+  base::android::ScopedJavaGlobalRef<jobject> bg_thread_client_object_;
 
   DISALLOW_COPY_AND_ASSIGN(AwContentsIoThreadClientImpl);
 };