[Android] Upstream WebView.allow{Content|File}Access implementation.

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
index 211f6ddd48d22679897a0307cdd59fb850309a5b..44b5b12662a0cf89775e0f313e2a15288f8cddae 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
@@ -95,6 +95,19 @@ public class AndroidWebViewTestBase
                 TimeUnit.SECONDS);
     }
 
+    protected void loadUrlSyncAndExpectError(final ContentViewCore contentViewCore,
+            CallbackHelper onPageFinishedHelper,
+            CallbackHelper onReceivedErrorHelper,
+            final String url) throws Throwable {
+        int onErrorCallCount = onReceivedErrorHelper.getCallCount();
+        int onFinishedCallCount = onPageFinishedHelper.getCallCount();
+        loadUrlAsync(contentViewCore, url);
+        onReceivedErrorHelper.waitForCallback(onErrorCallCount, 1, WAIT_TIMEOUT_SECONDS,
+                TimeUnit.SECONDS);
+        onPageFinishedHelper.waitForCallback(onFinishedCallCount, 1, WAIT_TIMEOUT_SECONDS,
+                TimeUnit.SECONDS);
+    }
+
     /**
      * Loads url on the UI thread but does not block.
      */