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

android_webview/embeddedtestserver/aw_embedded_test_server_android.h

Index: android_webview/embeddedtestserver/aw_embedded_test_server_android.h
diff --git a/net/test/embedded_test_server/android/embedded_test_server_android.h b/android_webview/embeddedtestserver/aw_embedded_test_server_android.h
similarity index 74%
copy from net/test/embedded_test_server/android/embedded_test_server_android.h
copy to android_webview/embeddedtestserver/aw_embedded_test_server_android.h
index 1b73082997d98a166f24c3e03f353672af75566b..c4ea3cebd8b05abce47838ccbf4847192dc8157e 100644
--- a/net/test/embedded_test_server/android/embedded_test_server_android.h
+++ b/android_webview/embeddedtestserver/aw_embedded_test_server_android.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_TEST_EMBEDDED_TEST_SERVER_ANDROID_EMBEDDED_TEST_SERVER_ANDROID_H_
-#define NET_TEST_EMBEDDED_TEST_SERVER_ANDROID_EMBEDDED_TEST_SERVER_ANDROID_H_
+#ifndef ANDROID_WEBVIEW_EMBEDDEDTESTSERVER_AW_EMBEDDED_TEST_SERVER_ANDROID_H_
+#define ANDROID_WEBVIEW_EMBEDDEDTESTSERVER_AW_EMBEDDED_TEST_SERVER_ANDROID_H_
 
 #include <jni.h>
 
@@ -17,7 +17,7 @@
 namespace net {
 namespace test_server {
 
-// The C++ side of the Java EmbeddedTestServer.
+// The C++ side of the Android webview Java EmbeddedTestServer.
 class EmbeddedTestServerAndroid {
  public:
   EmbeddedTestServerAndroid(JNIEnv* env,
@@ -42,6 +42,16 @@ class EmbeddedTestServerAndroid {
       const base::android::JavaParamRef<jobject>& jobj,
       const base::android::JavaParamRef<jstring>& jdirectory_path);
 
+  base::android::ScopedJavaLocalRef<jlongArray> GetCustomHandlers(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& jobj);
+
+  void RegisterRequestHandler(JNIEnv* jenv,
+                              const base::android::JavaParamRef<jobject>& jobj,
+                              jlong handler);
+
+  std::unique_ptr<HttpResponse> getHandlerUniquePtr(jlong handler_ptr);
+
   void ServeFilesFromDirectory(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& jobj,
@@ -60,4 +70,4 @@ class EmbeddedTestServerAndroid {
 }  // namespace test_server
 }  // namespace net
 
-#endif  // NET_TEST_EMBEDDED_TEST_SERVER_ANDROID_EMBEDDED_TEST_SERVER_ANDROID_H_
+#endif  // ANDROID_WEBVIEW_EMBEDDEDTESTSERVER_AW_EMBEDDED_TEST_SERVER_ANDROID_H_