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

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
 
@@ skipping 88 matching lines @@
 }
 
 instrumentation_test_apk("android_webview_test_apk") {
   apk_name = "AndroidWebViewTest"
   apk_under_test = ":android_webview_apk"
   android_manifest = "../javatests/AndroidManifest.xml"
   deps = [
     "//android_webview:android_webview_crash_services_java",
     "//android_webview:android_webview_java",
     "//android_webview:android_webview_platform_services_java",
+    "//android_webview/embeddedtestserver:aw_net_java_test_support",
     "//base:base_java",
     "//base:base_java_test_support",
     "//components/minidump_uploader:minidump_uploader_java",
     "//components/minidump_uploader:minidump_uploader_javatests",
     "//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",
     "//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",
   ]
   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/AwContentsAnchorViewTest.java",
@@ skipping 76 matching lines @@
     "../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",
   ]
   data = [
     "data/",
   ]
-  additional_apks = [ "//net/android:net_test_support_apk" ]
+  additional_apks = [
+    "//net/android:net_test_support_apk",

[jbudorick, 2017/03/09 02:00:48]

Do we need both?

[shenghuazhang, 2017/03/13 18:48:15]

No :) Removed it.

+    "//android_webview/embeddedtestserver:aw_net_test_support_apk",
+  ]
 }
 
 test("android_webview_unittests") {
   # Tests do not require any data, but our dependencies pull a lot in.
   ignore_all_data_deps = true
 
   # Dependencies (e.g. Play services) make the binary reach the dex limit.
   enable_multidex = true
 
   deps = [
@@ skipping 59 matching lines @@
     "../unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java",
   ]
 }
 
 shared_library("libdrawgl") {
   sources = [
     "shell/src/draw_gl/draw_gl.cc",
   ]
   configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
 }