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

net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java

Index: net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java
diff --git a/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java b/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java
index defdd476ae2bf4fd6d3de26628367573a22c1fce..703c3c93cd4456267a8c5f82d1d3bf6a2c192de9 100644
--- a/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java
+++ b/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java
@@ -37,14 +37,14 @@ public class EmbeddedTestServerImpl extends IEmbeddedTestServerImpl.Stub {
     private final Context mContext;
     private Handler mHandler;
     private HandlerThread mHandlerThread;
-    private long mNativeEmbeddedTestServer;
+    protected long mNativeEmbeddedTestServer;

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

This should be able to stay private.

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

Done.

 
     /** Create an uninitialized EmbeddedTestServer. */
     public EmbeddedTestServerImpl(Context context) {
         mContext = context;
     }
 
-    private <V> V runOnHandlerThread(Callable<V> c) {
+    protected <V> V runOnHandlerThread(Callable<V> c) {
         FutureTask<V> t = new FutureTask<>(c);
         mHandler.post(t);
         try {
@@ -214,8 +214,11 @@ public class EmbeddedTestServerImpl extends IEmbeddedTestServerImpl.Stub {
     private native boolean nativeStart(long nativeEmbeddedTestServerAndroid);
     private native boolean nativeShutdownAndWaitUntilComplete(long nativeEmbeddedTestServerAndroid);
     private native String nativeGetURL(long nativeEmbeddedTestServerAndroid, String relativeUrl);
-    private native void nativeAddDefaultHandlers(
-            long nativeEmbeddedTestServerAndroid, String directoryPath);
     private native void nativeServeFilesFromDirectory(
             long nativeEmbeddedTestServerAndroid, String directoryPath);
+
+    protected native void nativeAddDefaultHandlers(

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

Can we make these private and expose protected methods that the AW version can
call that don't require the native object?

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

Done.

+            long nativeEmbeddedTestServerAndroid, String directoryPath);
+    protected native void nativeRegisterRequestHandler(
+            long nativeEmbeddedTestServerAndroid, long handler);
 }