| 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 5e6d3fe0f8f6a07a04c5a3523cea39b3e6ec93bc..0f53545b5bf6514885851076c1e1dd3695095026 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,
|
|
|