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

android_webview/embeddedtestserver/aw_embedded_test_server_android.cc

Index: android_webview/embeddedtestserver/aw_embedded_test_server_android.cc
diff --git a/net/test/embedded_test_server/android/embedded_test_server_android.cc b/android_webview/embeddedtestserver/aw_embedded_test_server_android.cc
similarity index 72%
copy from net/test/embedded_test_server/android/embedded_test_server_android.cc
copy to android_webview/embeddedtestserver/aw_embedded_test_server_android.cc
index 0b25220c38cbe91b20ae4d6aea1be454debabf47..1137252560d3916e5327d7f3748926d835b19efb 100644
--- a/net/test/embedded_test_server/android/embedded_test_server_android.cc
+++ b/android_webview/embeddedtestserver/aw_embedded_test_server_android.cc
@@ -1,9 +1,11 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/test/embedded_test_server/android/embedded_test_server_android.h"
+#include "android_webview/embeddedtestserver/aw_embedded_test_server_android.h"
 
+#include "android_webview/embeddedtestserver/custom_handlers.h"
+#include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
@@ -14,6 +16,7 @@
 
 using base::android::JavaParamRef;
 using base::android::JavaRef;
+using base::android::ScopedJavaLocalRef;
 
 namespace net {
 namespace test_server {
@@ -42,7 +45,7 @@ jboolean EmbeddedTestServerAndroid::ShutdownAndWaitUntilComplete(
   return test_server_.ShutdownAndWaitUntilComplete();
 }
 
-base::android::ScopedJavaLocalRef<jstring> EmbeddedTestServerAndroid::GetURL(
+ScopedJavaLocalRef<jstring> EmbeddedTestServerAndroid::GetURL(
     JNIEnv* env,
     const JavaParamRef<jobject>& jobj,
     const JavaParamRef<jstring>& jrelative_url) const {
@@ -60,6 +63,29 @@ void EmbeddedTestServerAndroid::AddDefaultHandlers(
   test_server_.AddDefaultHandlers(directory);
 }
 
+ScopedJavaLocalRef<jlongArray> EmbeddedTestServerAndroid::GetCustomHandlers(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& jobj) {
+  return base::android::ToJavaLongArray(env, getHandlers());
+}
+
+void EmbeddedTestServerAndroid::RegisterRequestHandler(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& jobj,
+    jlong handler) {
+  // test_server_.RegisterRequestHandler(
+  //     base::Bind(&EmbeddedTestServerAndroid::getHandlerUniquePtr,
+  //               handler));
+  test_server_.RegisterRequestHandler(base::Bind(&HandleClickRedirect));
+}
+
+std::unique_ptr<HttpResponse> EmbeddedTestServerAndroid::getHandlerUniquePtr(
+    jlong handler) {
+  std::unique_ptr<HttpResponse> http_response(
+      reinterpret_cast<HttpResponse*>(handler));
+  return std::move(http_response);
+}
+
 void EmbeddedTestServerAndroid::ServeFilesFromDirectory(
     JNIEnv* env,
     const JavaParamRef<jobject>& jobj,