[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..94482729ae9145677cd1271e7a440d9bf3c1159a 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
@@ -44,7 +44,7 @@ public class EmbeddedTestServerImpl extends IEmbeddedTestServerImpl.Stub {
         mContext = context;
     }
 
-    private <V> V runOnHandlerThread(Callable<V> c) {
+    protected <V> V runOnHandlerThread(Callable<V> c) {

[jbudorick, 2017/03/13 23:32:54]

We shouldn't need to expose this to the subclass.

[shenghuazhang, 2017/03/17 01:07:16]

Done.

         FutureTask<V> t = new FutureTask<>(c);
         mHandler.post(t);
         try {
@@ -209,13 +209,23 @@ public class EmbeddedTestServerImpl extends IEmbeddedTestServerImpl.Stub {
         mNativeEmbeddedTestServer = 0;
     }
 
+    protected void callAddDefaultHandlers(String directoryPath) {

[shenghuazhang, 2017/03/17 01:07:16]

removed this method since no class uses it.

+        nativeAddDefaultHandlers(mNativeEmbeddedTestServer, directoryPath);
+    }
+
+    protected void callRegisterRequestHandler(long handler) {

[jbudorick, 2017/03/13 23:32:54]

This should:
 - be public
 - be named registerRequestHandler
 - do the runOnHandlerThread dance that the other public methods do

[shenghuazhang, 2017/03/17 01:07:15]

Done.

+        nativeRegisterRequestHandler(mNativeEmbeddedTestServer, handler);
+    }
+
     private native void nativeInit(String testDataDir);
     private native void nativeDestroy(long nativeEmbeddedTestServerAndroid);
     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 nativeRegisterRequestHandler(
+            long nativeEmbeddedTestServerAndroid, long handler);
+    private native String nativeGetURL(long nativeEmbeddedTestServerAndroid, String relativeUrl);
     private native void nativeServeFilesFromDirectory(
             long nativeEmbeddedTestServerAndroid, String directoryPath);
 }