[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..26d94e4e61d5c0d6185e0b0ad0126d8877a6c7e6 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
@@ -38,6 +38,7 @@ public class EmbeddedTestServerImpl extends IEmbeddedTestServerImpl.Stub {
     private Handler mHandler;
     private HandlerThread mHandlerThread;
     private long mNativeEmbeddedTestServer;
+    private long mNativeCustomHandler;
 
     /** Create an uninitialized EmbeddedTestServer. */
     public EmbeddedTestServerImpl(Context context) {
@@ -122,6 +123,34 @@ public class EmbeddedTestServerImpl extends IEmbeddedTestServerImpl.Stub {
         });
     }
 
+    @Override
+    public long[] getCustomHandlers() {
+        return runOnHandlerThread(new Callable<long[]>() {
+            @Override
+            public long[] call() {
+                return nativeGetCustomHandlers(mNativeEmbeddedTestServer);
+            }
+        });
+    }
+
+    /** Register multiple request handlers.
+     *  Handlers must be registered before starting the server.
+     *
+     *  @param handlers The pointers of handlers to be registered.
+     */
+    @Override
+    public void registerRequestHandlers(final long[] handlers) {
+        runOnHandlerThread(new Callable<Void>() {
+            @Override
+            public Void call() {
+                for (int i = 0; i < handlers.length; i++) {
+                    nativeRegisterRequestHandler(mNativeEmbeddedTestServer, handlers[i]);
+                }
+                return null;
+            }
+        });
+    }
+
     /** Serve files from the provided directory.
      *
      *  @param directoryPath The path of the directory from which files should be served.
@@ -216,6 +245,9 @@ public class EmbeddedTestServerImpl extends IEmbeddedTestServerImpl.Stub {
     private native String nativeGetURL(long nativeEmbeddedTestServerAndroid, String relativeUrl);
     private native void nativeAddDefaultHandlers(
             long nativeEmbeddedTestServerAndroid, String directoryPath);
+    private native long[] nativeGetCustomHandlers(long nativeEmbeddedTestServerAndroid);
+    private native void nativeRegisterRequestHandler(
+            long nativeEmbeddedTestServerAndroid, long handler);
     private native void nativeServeFilesFromDirectory(
             long nativeEmbeddedTestServerAndroid, String directoryPath);
 }