| Index: net/test/embedded_test_server/android/embedded_test_server_android.cc
|
| diff --git a/net/test/embedded_test_server/android/embedded_test_server_android.cc b/net/test/embedded_test_server/android/embedded_test_server_android.cc
|
| index 0b25220c38cbe91b20ae4d6aea1be454debabf47..fb492000680ad74c6ed7902824e58989bdb21ebc 100644
|
| --- a/net/test/embedded_test_server/android/embedded_test_server_android.cc
|
| +++ b/net/test/embedded_test_server/android/embedded_test_server_android.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "net/test/embedded_test_server/android/embedded_test_server_android.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 +15,7 @@
|
|
|
| using base::android::JavaParamRef;
|
| using base::android::JavaRef;
|
| +using base::android::ScopedJavaLocalRef;
|
|
|
| namespace net {
|
| namespace test_server {
|
| @@ -42,7 +44,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 +62,17 @@ void EmbeddedTestServerAndroid::AddDefaultHandlers(
|
| test_server_.AddDefaultHandlers(directory);
|
| }
|
|
|
| +typedef std::unique_ptr<HttpResponse> (*HandleRequestPtr)(
|
| + const HttpRequest& request);
|
| +
|
| +void EmbeddedTestServerAndroid::RegisterRequestHandler(
|
| + JNIEnv* env,
|
| + const JavaParamRef<jobject>& jobj,
|
| + jlong handler) {
|
| + HandleRequestPtr handler_ptr = reinterpret_cast<HandleRequestPtr>(handler);
|
| + test_server_.RegisterRequestHandler(base::Bind(handler_ptr));
|
| +}
|
| +
|
| void EmbeddedTestServerAndroid::ServeFilesFromDirectory(
|
| JNIEnv* env,
|
| const JavaParamRef<jobject>& jobj,
|
|
|