[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/android_webview/embeddedtestserver/aw_embedded_test_server_android.h b/android_webview/embeddedtestserver/aw_embedded_test_server_android.h
new file mode 100644
index 0000000000000000000000000000000000000000..2b3c5c0a8e4bc34d989bce0988722b246004aa96
--- /dev/null
+++ b/android_webview/embeddedtestserver/aw_embedded_test_server_android.h
@@ -0,0 +1,73 @@
+// Copyright 2015 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.
+
+#ifndef ANDROID_WEBVIEW_EMBEDDEDTESTSERVER_AW_EMBEDDED_TEST_SERVER_ANDROID_H_
+#define ANDROID_WEBVIEW_EMBEDDEDTESTSERVER_AW_EMBEDDED_TEST_SERVER_ANDROID_H_
+
+#include <jni.h>
+
+#include "base/android/jni_weak_ref.h"
+#include "base/android/scoped_java_ref.h"
+#include "base/macros.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
+#include "net/test/embedded_test_server/http_request.h"
+#include "net/test/embedded_test_server/http_response.h"
+
+namespace net {
+namespace test_server {
+
+// The C++ side of the Android webview Java EmbeddedTestServer.
+class AwEmbeddedTestServerAndroid {
+ public:
+  AwEmbeddedTestServerAndroid(JNIEnv* env,
+                              const base::android::JavaRef<jobject>& obj);
+  ~AwEmbeddedTestServerAndroid();
+
+  void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
+
+  jboolean Start(JNIEnv* env, const base::android::JavaParamRef<jobject>& jobj);
+
+  jboolean ShutdownAndWaitUntilComplete(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& jobj);
+
+  base::android::ScopedJavaLocalRef<jstring> GetURL(
+      JNIEnv* jenv,
+      const base::android::JavaParamRef<jobject>& jobj,
+      const base::android::JavaParamRef<jstring>& jrelative_url) const;
+
+  void AddDefaultHandlers(
+      JNIEnv* jenv,
+      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);
+
+  std::unique_ptr<HttpResponse> getHandlerUniquePtr(jlong handler_ptr);
+
+  void RegisterRequestHandler(JNIEnv* jenv,
+                              const base::android::JavaParamRef<jobject>& jobj,
+                              jlong handler);
+
+  void ServeFilesFromDirectory(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& jobj,
+      const base::android::JavaParamRef<jstring>& jdirectory_path);
+
+  static bool RegisterAwEmbeddedTestServerAndroid(JNIEnv* env);
+
+ private:
+  JavaObjectWeakGlobalRef weak_java_server_;
+
+  EmbeddedTestServer test_server_;
+
+  DISALLOW_COPY_AND_ASSIGN(AwEmbeddedTestServerAndroid);
+};
+
+}  // namespace test_server
+}  // namespace net
+
+#endif  // ANDROID_WEBVIEW_EMBEDDEDTESTSERVER_AW_EMBEDDED_TEST_SERVER_ANDROID_H_