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

Unified Diff: android_webview/embeddedtestserver/aw_test_jni_onload.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: android_webview/embeddedtestserver/aw_test_jni_onload.cc
diff --git a/android_webview/embeddedtestserver/aw_test_jni_onload.cc b/android_webview/embeddedtestserver/aw_test_jni_onload.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2c2b566ce282c8fff8f3b2b553cc0aee2a2f715c
--- /dev/null
+++ b/android_webview/embeddedtestserver/aw_test_jni_onload.cc
@@ -0,0 +1,42 @@
+// 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 "android_webview/embeddedtestserver/custom_handlers.h"
+#include "base/android/base_jni_onload.h"
+#include "base/android/base_jni_registrar.h"
+#include "base/android/jni_android.h"
+#include "base/bind.h"
+#include "base/trace_event/trace_event.h"
+#include "net/test/android/net_test_jni_onload.h"
+#include "net/test/embedded_test_server/android/embedded_test_server_android.h"
+
+namespace net {
jbudorick 2017/03/09 02:00:47 This should be android_webvew::test, not net::test
shenghuazhang 2017/03/13 18:48:15 Done.
+namespace test {
+
+namespace {
+
+bool RegisterJNI(JNIEnv* env) {
+ return net::test_server::EmbeddedTestServerAndroid::
+ RegisterEmbeddedTestServerAndroid(env);
+}
+
+bool RegisterHandlersJNI(JNIEnv* env) {
+ TRACE_EVENT0("native", "net::test::RegisterHandlersJNI");
+ return net::test::RegisterCustomHandlers(env);
+}
+
+} // namesapce
+
+bool OnJNIOnLoadRegisterJNI(JNIEnv* env) {
+ return base::android::OnJNIOnLoadRegisterJNI(env) &&
+ base::android::RegisterJni(env) && RegisterHandlersJNI(env) &&
+ RegisterJNI(env);
+}
+
+bool OnJNIOnLoadInit() {
+ return base::android::OnJNIOnLoadInit();
+}
+
+} // namespace test
+} // namespace net

Powered by Google App Engine
This is Rietveld 408576698