Make shouldInterceptRequest thinner in glue

android_webview/java/src/org/chromium/android_webview/AwContentsClient.java

 // Copyright 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.
 
 package org.chromium.android_webview;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.graphics.Bitmap;
 import android.graphics.Picture;
 import android.net.Uri;
 import android.net.http.SslError;
 import android.os.Looper;
 import android.os.Message;
 import android.view.KeyEvent;
 import android.view.View;
 import android.webkit.ConsoleMessage;
 import android.webkit.GeolocationPermissions;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebResourceResponse;
 
 import org.chromium.android_webview.permission.AwPermissionRequest;
+import org.chromium.base.VisibleForTesting;
 
 import java.security.Principal;
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Base-class that an AwContents embedder derives from to receive callbacks.
  * This extends ContentViewClient, as in many cases we want to pass-thru ContentViewCore
  * callbacks right to our embedder, and this setup facilities that.
  * For any other callbacks we need to make transformations of (e.g. adapt parameters
  * or perform filtering) we can provide final overrides for methods here, and then introduce
  * new abstract methods that the our own client must implement.
  * i.e.: all methods in this class should either be final, or abstract.
  */
@@ skipping 35 matching lines @@
         mCachedRendererBackgroundColor = color == INVALID_COLOR ? 1 : color;
     }
 
     //--------------------------------------------------------------------------------------------
     //             WebView specific methods that map directly to WebViewClient / WebChromeClient
     //--------------------------------------------------------------------------------------------
 
     /**
      * Parameters for the {@link AwContentsClient#shouldInterceptRequest} method.
      */
-    public static class AwWebResourceRequest {
+    public static class WebResourceRequestImpl implements WebResourceRequest {
         // Url of the request.
-        public String url;
+        public String mUrl;

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

Should these fields become private and final?

         // Is this for the main frame or a child iframe?
-        public boolean isMainFrame;
+        public boolean mIsMainFrame;
         // Was a gesture associated with the request? Don't trust can easily be spoofed.
-        public boolean hasUserGesture;
+        public boolean mHasUserGesture;
         // Method used (GET/POST/OPTIONS)
-        public String method;
+        public String mMethod;
         // Headers that would have been sent to server.
-        public HashMap<String, String> requestHeaders;
+        public Map<String, String> mRequestHeaders;
+
+        public WebResourceRequestImpl(String url, boolean isMainFrame, boolean hasUserGesture,
+                String method, HashMap<String, String> requestHeaders) {
+            mUrl = url;
+            mIsMainFrame = isMainFrame;
+            mHasUserGesture = hasUserGesture;
+            mMethod = method;
+            mRequestHeaders = requestHeaders;
+        }
+
+        @VisibleForTesting
+        public String getUrlString() {
+            return mUrl;
+        }
+
+        @Override
+        public Uri getUrl() {
+            return Uri.parse(mUrl);
+        }
+
+        @Override
+        public boolean isForMainFrame() {
+            return mIsMainFrame;
+        }
+
+        @Override
+        public boolean hasGesture() {

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

Let's stick to hasUserGesture, as it is traceable down into Chromium guts.

+            return mHasUserGesture;
+        }
+
+        @Override
+        public String getMethod() {
+            return mMethod;
+        }
+
+        @Override
+        public Map<String, String> getRequestHeaders() {
+            return mRequestHeaders;
+        }
     }
 
     public abstract void getVisitedHistory(ValueCallback<String[]> callback);
 
     public abstract void doUpdateVisitedHistory(String url, boolean isReload);
 
     public abstract void onProgressChanged(int progress);
 
-    public abstract AwWebResourceResponse shouldInterceptRequest(
-            AwWebResourceRequest request);
+    public abstract WebResourceResponse shouldInterceptRequest(WebResourceRequestImpl request);
 
     public abstract boolean shouldOverrideKeyEvent(KeyEvent event);
 
     public abstract boolean shouldOverrideUrlLoading(String url);
 
     public abstract void onLoadResource(String url);
 
     public abstract void onUnhandledKeyEvent(KeyEvent event);
 
     public abstract boolean onConsoleMessage(ConsoleMessage consoleMessage);
@@ skipping 168 matching lines @@
     public abstract void onFindResultReceived(int activeMatchOrdinal, int numberOfMatches,
             boolean isDoneCounting);
 
     /**
      * Called whenever there is a new content picture available.
      * @param picture New picture.
      */
     public abstract void onNewPicture(Picture picture);
 
 }