Make shouldInterceptRequest thinner in glue

android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java

 // Copyright 2014 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.
 
 package com.android.webview.chromium;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
@@ skipping 16 matching lines @@
 import android.webkit.DownloadListener;
 import android.webkit.GeolocationPermissions;
 import android.webkit.JsDialogHelper;
 import android.webkit.JsPromptResult;
 import android.webkit.JsResult;
 import android.webkit.PermissionRequest;
 import android.webkit.SslErrorHandler;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 import android.webkit.WebChromeClient.CustomViewCallback;
-import android.webkit.WebResourceRequest;
 import android.webkit.WebResourceResponse;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
 import com.android.webview.chromium.WebViewDelegateFactory.WebViewDelegate;
 
 import org.chromium.android_webview.AwContentsClient;
 import org.chromium.android_webview.AwContentsClientBridge;
 import org.chromium.android_webview.AwHttpAuthHandler;
-import org.chromium.android_webview.AwWebResourceResponse;
 import org.chromium.android_webview.JsPromptResultReceiver;
 import org.chromium.android_webview.JsResultReceiver;
 import org.chromium.android_webview.permission.AwPermissionRequest;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.TraceEvent;
 import org.chromium.content.browser.ContentView;
 import org.chromium.content.browser.ContentViewClient;
 import org.chromium.content.browser.ContentViewCore;
 
 import java.lang.ref.WeakReference;
 import java.net.URISyntaxException;
 import java.security.Principal;
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.WeakHashMap;
 
 /**
  * An adapter class that forwards the callbacks from {@link ContentViewClient}
  * to the appropriate {@link WebViewClient} or {@link WebChromeClient}.
  *
  * An instance of this class is associated with one {@link WebViewChromium}
  * instance. A WebViewChromium is a WebView implementation provider (that is
  * android.webkit.WebView delegates all functionality to it) and has exactly
  * one corresponding {@link ContentView} instance.
@@ skipping 202 matching lines @@
             TraceEvent.begin("WebViewContentsClientAdapter.onProgressChanged");
             if (mWebChromeClient != null) {
                 if (TRACE) Log.d(TAG, "onProgressChanged=" + progress);
                 mWebChromeClient.onProgressChanged(mWebView, progress);
             }
         } finally {
             TraceEvent.end("WebViewContentsClientAdapter.onProgressChanged");
         }
     }
 
-    private static class WebResourceRequestImpl implements WebResourceRequest {
-        private final AwWebResourceRequest mRequest;
-
-        public WebResourceRequestImpl(AwWebResourceRequest request) {
-            mRequest = request;
-        }
-
-        @Override
-        public Uri getUrl() {
-            return Uri.parse(mRequest.url);
-        }
-
-        @Override
-        public boolean isForMainFrame() {
-            return mRequest.isMainFrame;
-        }
-
-        @Override
-        public boolean hasGesture() {
-            return mRequest.hasUserGesture;
-        }
-
-        @Override
-        public String getMethod() {
-            return mRequest.method;
-        }
-
-        @Override
-        public Map<String, String> getRequestHeaders() {
-            return mRequest.requestHeaders;
-        }
-    }
-
     /**
      * @see AwContentsClient#shouldInterceptRequest(java.lang.String)
      */
     @Override
-    public AwWebResourceResponse shouldInterceptRequest(AwWebResourceRequest request) {
+    public WebResourceResponse shouldInterceptRequest(WebResourceRequestImpl request) {

[mnaganov (inactive), 2015/03/06 12:47:40]

Hmm... I'm actually not sure that we should pass android.webkit types into the
glue layer, because how would you pass types that are not in the API yet? I
guess, conversion from Aw.. types into android.webkit types is exactly the task
for the glue layer, not for upstream code.

         try {
             TraceEvent.begin("WebViewContentsClientAdapter.shouldInterceptRequest");
-            if (TRACE) Log.d(TAG, "shouldInterceptRequest=" + request.url);
-            WebResourceResponse response = mWebViewClient.shouldInterceptRequest(mWebView,
-                    new WebResourceRequestImpl(request));
-            if (response == null) return null;
-
-            // AwWebResourceResponse should support null headers. b/16332774.
-            Map<String, String> responseHeaders = response.getResponseHeaders();
-            if (responseHeaders == null) responseHeaders = new HashMap<String, String>();
-
-            return new AwWebResourceResponse(
-                    response.getMimeType(),
-                    response.getEncoding(),
-                    response.getData(),
-                    response.getStatusCode(),
-                    response.getReasonPhrase(),
-                    responseHeaders);
+            if (TRACE) Log.d(TAG, "shouldInterceptRequest=" + request.getUrl());
+            return mWebViewClient.shouldInterceptRequest(mWebView, request);
         } finally {
             TraceEvent.end("WebViewContentsClientAdapter.shouldInterceptRequest");
         }
     }
 
     /**
      * @see AwContentsClient#shouldOverrideUrlLoading(java.lang.String)
      */
     @Override
     public boolean shouldOverrideUrlLoading(String url) {
@@ skipping 893 matching lines @@
             else
                 mAwPermissionRequest.deny();
         }
 
         @Override
         public void deny() {
             mAwPermissionRequest.deny();
         }
     }
 }