[Android] Begin switching from lighttpd + apache to EmbeddedTestServer.

net/BUILD.gn

 # Copyright (c) 2013 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/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/module_args/v8.gni")
 import("//url/config.gni")
 import("//testing/test.gni")
@@ skipping 653 matching lines @@
     "test/net_test_suite.cc",
     "test/net_test_suite.h",
     "test/python_utils.cc",
     "test/python_utils.h",
     "test/spawned_test_server/base_test_server.cc",
     "test/spawned_test_server/base_test_server.h",
     "test/spawned_test_server/local_test_server.cc",
     "test/spawned_test_server/local_test_server.h",
     "test/spawned_test_server/local_test_server_posix.cc",
     "test/spawned_test_server/local_test_server_win.cc",
-    "test/spawned_test_server/remote_test_server.cc",
-    "test/spawned_test_server/remote_test_server.h",
     "test/spawned_test_server/spawned_test_server.h",
-    "test/spawned_test_server/spawner_communicator.cc",
-    "test/spawned_test_server/spawner_communicator.h",
     "test/url_request/url_request_failed_job.cc",
     "test/url_request/url_request_failed_job.h",
     "test/url_request/url_request_mock_data_job.cc",
     "test/url_request/url_request_mock_data_job.h",
     "test/url_request/url_request_slow_download_job.cc",
     "test/url_request/url_request_slow_download_job.h",
     "url_request/test_url_fetcher_factory.cc",
     "url_request/test_url_fetcher_factory.h",
     "url_request/url_request_test_util.cc",
     "url_request/url_request_test_util.h",
@@ skipping 14 matching lines @@
   ]
 
   if (!is_ios) {
     public_deps += [ "//third_party/protobuf:py_proto" ]
   }
 
   if (use_nss_certs || is_ios) {
     public_deps += [ "//crypto:platform" ]
   }
 
-  if (!is_android) {
-    sources -= [
+  if (is_android) {
+    public_deps += [ ":net_test_jni_headers" ]
+    sources += [
+      "test/android/net_test_jni_onload.cc",
+      "test/android/net_test_jni_onload.h",
+      "test/embedded_test_server/android/embedded_test_server_android.cc",
+      "test/embedded_test_server/android/embedded_test_server_android.h",
       "test/spawned_test_server/remote_test_server.cc",
       "test/spawned_test_server/remote_test_server.h",
       "test/spawned_test_server/spawner_communicator.cc",
       "test/spawned_test_server/spawner_communicator.h",
     ]
   }
 
   if (use_v8_in_net) {
     public_deps += [ ":net_with_v8" ]
   }
@@ skipping 494 matching lines @@
       "android/java/src/org/chromium/net/NetworkChangeNotifier.java",
       "android/java/src/org/chromium/net/ProxyChangeListener.java",
       "android/java/src/org/chromium/net/X509Util.java",
     ]
     jni_package = "net"
   }
   generate_jni("net_test_jni_headers") {
     sources = [
       "android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
       "test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java",
+      "test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java",
     ]
-    jni_package = "net"
+    jni_package = "net/test"
   }
 }
 
 if (is_android || is_linux) {
   executable("disk_cache_memory_test") {
     testonly = true
     sources = [
       "tools/disk_cache_memory_test/disk_cache_memory_test.cc",
     ]
     deps = [
@@ skipping 468 matching lines @@
   } else {
     sources -= [ "proxy/proxy_resolver_perftest.cc" ]
   }
 
   if (is_win && icu_use_data_file) {
     # This is needed to trigger the dll copy step on windows.
     # TODO(mark): Specifying this here shouldn't be necessary.
     deps += [ "//third_party/icu:icudata" ]
   }
 }