Make shouldInterceptRequest thinner in glue

android_webview/java/src/org/chromium/android_webview/AwContents.java

Index: android_webview/java/src/org/chromium/android_webview/AwContents.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
index 9384385d22831811b3e759d02cca213d8acfcb53..2e0ab59258f56b52f21943b160f0f220f8582f00 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -35,6 +35,7 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.webkit.GeolocationPermissions;
 import android.webkit.ValueCallback;
+import android.webkit.WebResourceResponse;
 import android.widget.OverScroller;
 
 import org.chromium.android_webview.permission.AwPermissionRequest;
@@ -357,20 +358,20 @@ public class AwContents implements SmartClipProvider,
 
         @Override
         public AwWebResourceResponse shouldInterceptRequest(
-                AwContentsClient.AwWebResourceRequest request) {
-            String url = request.url;
+                AwContentsClient.WebResourceRequestImpl request) {
+            String url = request.getUrlString();
             AwWebResourceResponse awWebResourceResponse;
             // Return the response directly if the url is default video poster url.
             awWebResourceResponse = mDefaultVideoPosterRequestHandler.shouldInterceptRequest(url);
-            if (awWebResourceResponse != null) return awWebResourceResponse;
 
-            awWebResourceResponse = mContentsClient.shouldInterceptRequest(request);
+            WebResourceResponse response = mContentsClient.shouldInterceptRequest(request);
+            if (response != null) awWebResourceResponse = new AwWebResourceResponse(response);

[mnaganov (inactive), 2015/03/06 09:58:43]

nit: This looks a bit complex for a one-liner. Could you please use a braced
form?

 
             if (awWebResourceResponse == null) {
                 mContentsClient.getCallbackHelper().postOnLoadResource(url);
             }
 
-            if (request.isMainFrame && awWebResourceResponse != null
+            if (request.isForMainFrame() && awWebResourceResponse != null
                     && awWebResourceResponse.getData() == null) {
                 // In this case the intercepted URLRequest job will simulate an empty response
                 // which doesn't trigger the onReceivedError callback. For WebViewClassic