Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(814)

Unified Diff: net/test/embedded_test_server/android/embedded_test_server_android.cc

Issue 2687573002: [Android Webview] Refactor LoadUrlTest and work on embedded_test_server custom handler (Closed)
Patch Set: ready Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..302d6fd39b461292331e1c62246f719a2bf9fd1c 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> (*HandlerUniquePtr)(
jbudorick 2017/03/09 02:00:48 nit: maybe HandleRequestPtr?
shenghuazhang 2017/03/13 18:48:15 Done.
+ const HttpRequest& request);
+
+void EmbeddedTestServerAndroid::RegisterRequestHandler(
+ JNIEnv* env,
+ const JavaParamRef<jobject>& jobj,
+ jlong handler) {
+ HandlerUniquePtr& handler_ptr = reinterpret_cast<HandlerUniquePtr&>(handler);
+ test_server_.RegisterRequestHandler(base::Bind(handler_ptr));
+}
+
void EmbeddedTestServerAndroid::ServeFilesFromDirectory(
JNIEnv* env,
const JavaParamRef<jobject>& jobj,

Powered by Google App Engine
This is Rietveld 408576698