Add test to ensure shouldOverrideUrlLoading throws Java exception

android_webview/test/BUILD.gn

Index: android_webview/test/BUILD.gn
diff --git a/android_webview/test/BUILD.gn b/android_webview/test/BUILD.gn
index 0744657a8607579c22529826b7f83b730080acc3..b16790676eebc190730cf1b8f9c0da562c823a23 100644
--- a/android_webview/test/BUILD.gn
+++ b/android_webview/test/BUILD.gn
@@ -20,11 +20,13 @@ android_apk("android_webview_apk") {
   deps = [
     ":android_webview_apk_assets",
     ":android_webview_apk_resources",
+    ":android_webview_java_test_utils",
     "//android_webview:android_webview_java",
     "//base:base_java",
     "//base:base_java_test_support",
     "//components/policy/android:policy_java_test_support",
     "//content/public/android:content_java",
+    "//content/public/test/android:content_java_test_support",
     "//ui/android:ui_java",
   ]
 
@@ -39,8 +41,8 @@ android_apk("android_webview_apk") {
     "shell/src/org/chromium/android_webview/test/AwInstrumentationTestRunner.java",
     "shell/src/org/chromium/android_webview/test/AwTestContainerView.java",
     "shell/src/org/chromium/android_webview/test/AwTestRunnerActivity.java",
-    "shell/src/org/chromium/android_webview/test/NullContentsClient.java",
     "shell/src/org/chromium/android_webview/test/SecondBrowserProcess.java",
+    "shell/src/org/chromium/android_webview/test/SeparateProcessWebViewService.java",
     "shell/src/org/chromium/android_webview/test/TestContentProvider.java",
   ]
   shared_libraries = [
@@ -103,6 +105,7 @@ instrumentation_test_apk("android_webview_test_apk") {
   apk_under_test = ":android_webview_apk"
   android_manifest = "../javatests/AndroidManifest.xml"
   deps = [
+    ":android_webview_java_test_utils",
     "//android_webview:android_webview_java",
     "//base:base_java",
     "//base:base_java_test_support",
@@ -132,6 +135,7 @@ instrumentation_test_apk("android_webview_test_apk") {
     "../javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java",
+    "../javatests/src/org/chromium/android_webview/test/JniCrashTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwContentsClientVisitedHistoryTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwContentsLifecycleNotifierTest.java",
@@ -182,7 +186,6 @@ instrumentation_test_apk("android_webview_test_apk") {
     "../javatests/src/org/chromium/android_webview/test/PostMessageTest.java",
     "../javatests/src/org/chromium/android_webview/test/SaveRestoreStateTest.java",
     "../javatests/src/org/chromium/android_webview/test/StandaloneAwQuotaManagerBridgeTest.java",
-    "../javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java",
     "../javatests/src/org/chromium/android_webview/test/TestAwServiceWorkerClient.java",
     "../javatests/src/org/chromium/android_webview/test/UserAgentTest.java",
     "../javatests/src/org/chromium/android_webview/test/VisualStateTest.java",
@@ -192,11 +195,9 @@ instrumentation_test_apk("android_webview_test_apk") {
     "../javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java",
     "../javatests/src/org/chromium/android_webview/test/util/AwQuotaManagerBridgeTestUtil.java",
     "../javatests/src/org/chromium/android_webview/test/util/AwTestTouchUtils.java",
-    "../javatests/src/org/chromium/android_webview/test/util/CommonResources.java",
     "../javatests/src/org/chromium/android_webview/test/util/CookieUtils.java",
     "../javatests/src/org/chromium/android_webview/test/util/GraphicsTestUtils.java",
     "../javatests/src/org/chromium/android_webview/test/util/ImagePageGenerator.java",
-    "../javatests/src/org/chromium/android_webview/test/util/JSUtils.java",
     "../javatests/src/org/chromium/android_webview/test/util/JavascriptEventObserver.java",
     "../javatests/src/org/chromium/android_webview/test/util/VideoSurfaceViewUtils.java",
     "../javatests/src/org/chromium/android_webview/test/util/VideoTestUtil.java",
@@ -206,6 +207,23 @@ instrumentation_test_apk("android_webview_test_apk") {
   additional_apks = [ "//net/android:net_test_support_apk" ]
 }
 
+android_library("android_webview_java_test_utils") {

[boliu, 2016/08/02 20:15:59]

maybe leave a comment why this is needed?

[gsennton, 2016/08/02 20:55:15]

Oooh, right, I have just been assuming we didn't want the shell/ directory to
depend on javatests/.
I was meaning to ask you:
do we have any kind of logic as to which classes live under 
shell/src/org/chromium/android_webview/test/util/
and which classes live under
javatests/src/org/chromium/android_webview/test/
?

(especially considering utility classes).

[boliu, 2016/08/03 05:12:37]

Layering is android_webview_test_apk (javatests) can depend on
android_webview_apk (shell), but not the other way around. So if something is
needed in the shell, like in your case, you have to move it to shell.

I think what happens here is that this target will be linked to both the shell
apk and the test apk, right?

[gsennton, 2016/09/06 15:26:08]

Yeah, I've just put these in the shell apk instead now.

+  testonly = true
+  java_files = [
+    "shell/src/org/chromium/android_webview/test/util/CommonResources.java",
+    "shell/src/org/chromium/android_webview/test/util/JSUtils.java",
+    "shell/src/org/chromium/android_webview/test/util/NullContentsClient.java",
+    "shell/src/org/chromium/android_webview/test/util/TestAwContentsClient.java",
+  ]
+  deps = [
+    "//android_webview:android_webview_java",
+    "//base:base_java",
+    "//base:base_java_test_support",
+    "//content/public/android:content_java",
+    "//content/public/test/android:content_java_test_support",
+  ]
+}
+
 # GYP: //android_webview/android_webview_tests.gypi:android_webview_unittests
 test("android_webview_unittests") {
   # Tests do not require any data, but our dependencies pull a lot in.