Add test to ensure shouldOverrideUrlLoading throws Java exception

android_webview/test/BUILD.gn

 # Copyright 2015 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.
 
 import("//build/config/android/rules.gni")
 import("//testing/test.gni")
 
 # Mark all targets as test only.
 testonly = true
 
 group("test") {
   deps = [
     ":android_webview_test_apk",
     ":android_webview_unittests",
   ]
 }
 
 # GYP: //android_webview/android_webview_tests.gypi:android_webview_apk
 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",
   ]
 
   apk_name = "AndroidWebView"
   android_manifest = "shell/AndroidManifest.xml"
   java_files = [
     "shell/src/org/chromium/android_webview/shell/AwShellActivity.java",
     "shell/src/org/chromium/android_webview/shell/AwShellApplication.java",
     "shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java",
     "shell/src/org/chromium/android_webview/shell/AwShellSwitches.java",
     "shell/src/org/chromium/android_webview/shell/DrawGL.java",
     "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 = [
     ":libdrawgl",
     ":libstandalonelibwebviewchromium",
   ]
 
   native_lib_version_rule = "//build/util:chrome_version_json"
   _native_lib_file =
       rebase_path("$root_gen_dir/CHROME_VERSION.json", root_build_dir)
@@ skipping 42 matching lines @@
   ]
   configs -= [ "//build/config/android:hide_native_jni_exports" ]
 }
 
 # GYP: //android_webview/android_webview_tests.gypi:android_webview_test_apk
 instrumentation_test_apk("android_webview_test_apk") {
   apk_name = "AndroidWebViewTest"
   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",
     "//components/external_video_surface:java",
     "//components/policy/android:policy_java",
     "//components/policy/android:policy_java_test_support",
     "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//net/android:net_java",
     "//net/android:net_java_test_support",
     "//third_party/android_tools:legacy_http_javalib",
     "//ui/android:ui_java",
   ]
   java_files = [
     "../javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java",
     "../javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java",
     "../javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java",
     "../javatests/src/org/chromium/android_webview/test/ArchiveTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwContentsClientAutoLoginTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwContentsClientCallbackHelperTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwContentsClientFaviconTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwContentsClientGetDefaultVideoPosterTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java",
     "../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",
     "../javatests/src/org/chromium/android_webview/test/AwContentsRenderTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwContentsStaticsTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwContentsTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwDebugTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwImeTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwJavaBridgeTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwLayoutSizerTest.java",
@@ skipping 30 matching lines @@
     "../javatests/src/org/chromium/android_webview/test/LoadUrlTest.java",
     "../javatests/src/org/chromium/android_webview/test/MediaAccessPermissionRequestTest.java",
     "../javatests/src/org/chromium/android_webview/test/MultipleVideosTest.java",
     "../javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java",
     "../javatests/src/org/chromium/android_webview/test/PlatformMediaCodecTest.java",
     "../javatests/src/org/chromium/android_webview/test/PolicyUrlFilteringTest.java",
     "../javatests/src/org/chromium/android_webview/test/PopupWindowTest.java",
     "../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",
     "../javatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java",
     "../javatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java",
     "../javatests/src/org/chromium/android_webview/test/WebViewFindApisTestBase.java",
     "../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",
     "../javatests/src/org/chromium/android_webview/test/util/VideoTestWebServer.java",
   ]
   isolate_file = "../android_webview_test_data.isolate"
   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.
   ignore_all_data_deps = true
 
   deps = [
     ":android_webview_unittests_assets",
     ":android_webview_unittests_java",
     ":android_webview_unittests_jni",
     "//android_webview:common",
@@ skipping 56 matching lines @@
   ]
 }
 
 # GYP: //android_webview/android_webview_tests.gypi:libdrawgl
 shared_library("libdrawgl") {
   sources = [
     "shell/src/draw_gl/draw_gl.cc",
   ]
   configs -= [ "//build/config/android:hide_native_jni_exports" ]
 }