[android_webview] Build test code against the shell APK.

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
index 4252adfd8b57e4908eb0c488650349ca080b9e46..0c3990afc1e2f2c78c9d5fba0fd355f6860e71ca 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
@@ -417,63 +417,28 @@ public class AwContentsClientShouldInterceptRequestTest extends AndroidWebViewTe
                 mContentsClient.getOnPageFinishedHelper().getCallCount());
     }
 
-    /**
-     * Configure the browser to load resources from the test harness instead of the browser
-     * application.
-     */
-    private void useTestResourceContext() {
-        AndroidProtocolHandler.setResourceContextForTesting(getInstrumentation().getContext());
-    }
-
-    /**
-     * Configure the browser to load resources from the browser application.
-     */
-    private void resetResourceContext() {
-        AndroidProtocolHandler.setResourceContextForTesting(null);
-    }
-
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testNotCalledForExistingResource() throws Throwable {
-        try {
-            useTestResourceContext();
-            notCalledForUrlTemplate("file:///android_res/raw/resource_file.html");
-        } finally {
-            resetResourceContext();
-        }
+        notCalledForUrlTemplate("file:///android_res/raw/resource_file.html");
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testCalledForNonexistentResource() throws Throwable {
-        try {
-            useTestResourceContext();
-            calledForUrlTemplate("file:///android_res/raw/no_file.html");
-        } finally {
-            resetResourceContext();
-        }
+        calledForUrlTemplate("file:///android_res/raw/no_file.html");
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testNotCalledForExistingAsset() throws Throwable {
-        try {
-            useTestResourceContext();
-            notCalledForUrlTemplate("file:///android_asset/asset_file.html");
-        } finally {
-            resetResourceContext();
-        }
+        notCalledForUrlTemplate("file:///android_asset/asset_file.html");
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testCalledForNonexistentAsset() throws Throwable {
-        try {
-            useTestResourceContext();
-            calledForUrlTemplate("file:///android_res/raw/no_file.html");
-        } finally {
-            resetResourceContext();
-        }
+        calledForUrlTemplate("file:///android_res/raw/no_file.html");
     }
 
     @SmallTest