Make shouldInterceptRequest thinner in glue

android_webview/java/src/org/chromium/android_webview/AwContentsIoThreadClient.java

Index: android_webview/java/src/org/chromium/android_webview/AwContentsIoThreadClient.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContentsIoThreadClient.java b/android_webview/java/src/org/chromium/android_webview/AwContentsIoThreadClient.java
index e431139e1558c0a9ff273a36d264bc74fc806451..9ef95e34ad89784d763ac5e051bd17b24546dfe8 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContentsIoThreadClient.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContentsIoThreadClient.java
@@ -40,7 +40,7 @@ public abstract class AwContentsIoThreadClient {
     public abstract void newLoginRequest(String realm, String account, String args);
 
     public abstract AwWebResourceResponse shouldInterceptRequest(
-            AwContentsClient.AwWebResourceRequest request);
+            AwContentsClient.WebResourceRequestImpl request);
 
     // Protected methods ---------------------------------------------------------------------------
 
@@ -48,16 +48,15 @@ public abstract class AwContentsIoThreadClient {
     protected AwWebResourceResponse shouldInterceptRequest(String url, boolean isMainFrame,
             boolean hasUserGesture, String method, String[] requestHeaderNames,
             String[] requestHeaderValues) {
-        AwContentsClient.AwWebResourceRequest request =
-                new AwContentsClient.AwWebResourceRequest();
-        request.url = url;
-        request.isMainFrame = isMainFrame;
-        request.hasUserGesture = hasUserGesture;
-        request.method = method;
-        request.requestHeaders = new HashMap<String, String>(requestHeaderNames.length);
+        HashMap<String, String> requestHeaders =
+                new HashMap<String, String>(requestHeaderNames.length);
         for (int i = 0; i < requestHeaderNames.length; ++i) {
-            request.requestHeaders.put(requestHeaderNames[i], requestHeaderValues[i]);
+            requestHeaders.put(requestHeaderNames[i], requestHeaderValues[i]);
         }
+
+        AwContentsClient.WebResourceRequestImpl request =
+                new AwContentsClient.WebResourceRequestImpl(
+                        url, isMainFrame, hasUserGesture, method, requestHeaders);
         return shouldInterceptRequest(request);
     }
 }