[Android] Add a Java version of net::test_server::EmbeddedTestServer.

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 90fe51f0d78bd4ec57d230de645617e1509fda5d..10b4008d65757b16a08dfbb65599e5a2ea30602d 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -177,7 +177,6 @@
           ],
           'dependencies': [
             'net_javatests',
-            'net_test_jni_headers',
           ],
         }],
         [ 'use_nss_certs != 1', {
@@ -634,7 +633,17 @@
             }],
           ],
         }],
-        ['OS != "android"', {
+        ['OS == "android"', {
+          'dependencies': [
+            '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',
+          ],
+        }, {
           'sources!': [
             'test/spawned_test_server/remote_test_server.cc',

[mef, 2015/06/17 21:55:55]

it seems that these were removed unless building for android, so this section
isn't needed anymore (if we remove corresponding main list).

[jbudorick, 2015/06/18 17:44:55]

Moved remote_test_server.{cc,h} and spawner_communicator.{cc,h} from the main
list to the 'sources' section above, and removed the OS == 'android' else
clause.

             'test/spawned_test_server/remote_test_server.h',
@@ -1368,9 +1377,10 @@
           'type': 'none',
           'sources': [
             'android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java',
+            'test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java',
           ],
           'variables': {
-            'jni_gen_package': 'net',
+            'jni_gen_package': 'net/test',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
@@ -1412,6 +1422,7 @@
             'java_in_dir': '../net/test/android/javatests',
           },
           'dependencies': [
+            'net_test_support',
             'url_request_failed_job_java',
             '../base/base.gyp:base_java',
             '<@(net_test_extra_libs)',