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

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

Issue 1465383003: [Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: agrieve comments Created 5 years, 1 month 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 86ef5bdde648154f5fa4dc81726d7b0fa8b5c141..ada8acf23d03b653995390a67f7d15d1380778d4 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
@@ -9,20 +9,21 @@
#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/trace_event/trace_event.h"
-#include "net/test/jni/EmbeddedTestServer_jni.h"
+#include "net/test/jni/EmbeddedTestServerImpl_jni.h"
namespace net {
namespace test_server {
EmbeddedTestServerAndroid::EmbeddedTestServerAndroid(JNIEnv* env, jobject jobj)
: weak_java_server_(env, jobj), test_server_() {
- Java_EmbeddedTestServer_setNativePtr(env, jobj,
- reinterpret_cast<intptr_t>(this));
+ Java_EmbeddedTestServerImpl_setNativePtr(env, jobj,
+ reinterpret_cast<intptr_t>(this));
}
EmbeddedTestServerAndroid::~EmbeddedTestServerAndroid() {
JNIEnv* env = base::android::AttachCurrentThread();
- Java_EmbeddedTestServer_clearNativePtr(env, weak_java_server_.get(env).obj());
+ Java_EmbeddedTestServerImpl_clearNativePtr(env,
+ weak_java_server_.get(env).obj());
}
jboolean EmbeddedTestServerAndroid::Start(JNIEnv* env, jobject jobj) {

Powered by Google App Engine
This is Rietveld 408576698