[Android Webview] Refactor LoadUrlTest and work on embedded_test_server custom handler

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 5bf43bd11c95d748be6467efe2a774460a2a9a6e..44ca486a3c46b689b3e6fef204bf09b34b209be9 100644
--- a/android_webview/test/BUILD.gn
+++ b/android_webview/test/BUILD.gn
@@ -106,6 +106,7 @@ instrumentation_test_apk("android_webview_test_apk") {
     "//android_webview:android_webview_crash_services_java",
     "//android_webview:android_webview_java",
     "//android_webview:android_webview_platform_services_java",
+    "//android_webview/test/embeddedtestserver:aw_net_java_test_support",
     "//base:base_java",
     "//base:base_java_test_support",
     "//components/minidump_uploader:minidump_uploader_java",
@@ -118,7 +119,6 @@ instrumentation_test_apk("android_webview_test_apk") {
     "//device/geolocation:geolocation_java",
     "//device/geolocation:geolocation_java_test_support",
     "//net/android:net_java",
-    "//net/android:net_java_test_support",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/android_tools:legacy_http_javalib",
     "//ui/android:ui_java",
@@ -215,7 +215,8 @@ instrumentation_test_apk("android_webview_test_apk") {
   data = [
     "data/",
   ]
-  additional_apks = [ "//net/android:net_test_support_apk" ]
+  additional_apks =
+      [ "//android_webview/test/embeddedtestserver:aw_net_test_support_apk" ]
 }
 
 test("android_webview_unittests") {