Make shouldInterceptRequest thinner in glue

android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java

 // Copyright 2013 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.test;
 
 import android.content.Context;
 import android.os.Build;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
+import android.webkit.WebResourceResponse;
 
 import org.chromium.android_webview.AwBrowserProcess;
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwCookieManager;
-import org.chromium.android_webview.AwWebResourceResponse;
 import org.chromium.android_webview.test.util.CommonResources;
 import org.chromium.android_webview.test.util.CookieUtils;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.MinAndroidSdkLevel;
 import org.chromium.content.app.ContentMain;
 import org.chromium.net.test.util.TestWebServer;
 
 
 /**
  * Tests for CookieManager/Chromium startup ordering weirdness.
@@ skipping 89 matching lines @@
         assertTrue(cookieManager.acceptCookie());
     }
 
     // https://code.google.com/p/chromium/issues/detail?id=374203
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testShouldInterceptRequestDeadlock() throws Throwable {
         String url = "http://www.example.com";
         TestAwContentsClient contentsClient = new TestAwContentsClient() {
             @Override
-            public AwWebResourceResponse shouldInterceptRequest(AwWebResourceRequest request) {
+            public WebResourceResponse shouldInterceptRequest(WebResourceRequestImpl request) {
                 (new AwCookieManager()).getCookie("www.example.com");
                 return null;
             }
         };
         startChromiumWithClient(contentsClient);
         loadUrlSync(mAwContents, contentsClient.getOnPageFinishedHelper(), url);
     }
 }