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

Side by Side Diff: net/test/embedded_test_server/android/embedded_test_server_android.cc

Issue 2301553002: Pass JavaRef to Java methods in net. (Closed)
Patch Set: Created 4 years, 3 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 unified diff | Download patch
« no previous file with comments | « net/test/embedded_test_server/android/embedded_test_server_android.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/test/embedded_test_server/android/embedded_test_server_android.h" 5 #include "net/test/embedded_test_server/android/embedded_test_server_android.h"
6 6
7 #include "base/android/jni_string.h" 7 #include "base/android/jni_string.h"
8 #include "base/android/scoped_java_ref.h" 8 #include "base/android/scoped_java_ref.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/test/test_support_android.h" 11 #include "base/test/test_support_android.h"
12 #include "base/trace_event/trace_event.h" 12 #include "base/trace_event/trace_event.h"
13 #include "net/test/jni/EmbeddedTestServerImpl_jni.h" 13 #include "net/test/jni/EmbeddedTestServerImpl_jni.h"
14 14
15 using base::android::JavaParamRef; 15 using base::android::JavaParamRef;
16 using base::android::JavaRef;
16 17
17 namespace net { 18 namespace net {
18 namespace test_server { 19 namespace test_server {
19 20
20 EmbeddedTestServerAndroid::EmbeddedTestServerAndroid(JNIEnv* env, jobject jobj) 21 EmbeddedTestServerAndroid::EmbeddedTestServerAndroid(
22 JNIEnv* env,
23 const JavaRef<jobject>& jobj)
21 : weak_java_server_(env, jobj), test_server_() { 24 : weak_java_server_(env, jobj), test_server_() {
22 Java_EmbeddedTestServerImpl_setNativePtr(env, jobj, 25 Java_EmbeddedTestServerImpl_setNativePtr(env, jobj,
23 reinterpret_cast<intptr_t>(this)); 26 reinterpret_cast<intptr_t>(this));
24 } 27 }
25 28
26 EmbeddedTestServerAndroid::~EmbeddedTestServerAndroid() { 29 EmbeddedTestServerAndroid::~EmbeddedTestServerAndroid() {
27 JNIEnv* env = base::android::AttachCurrentThread(); 30 JNIEnv* env = base::android::AttachCurrentThread();
28 Java_EmbeddedTestServerImpl_clearNativePtr(env, weak_java_server_.get(env)); 31 Java_EmbeddedTestServerImpl_clearNativePtr(env, weak_java_server_.get(env));
29 } 32 }
30 33
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 new EmbeddedTestServerAndroid(env, jobj); 84 new EmbeddedTestServerAndroid(env, jobj);
82 } 85 }
83 86
84 // static 87 // static
85 bool EmbeddedTestServerAndroid::RegisterEmbeddedTestServerAndroid(JNIEnv* env) { 88 bool EmbeddedTestServerAndroid::RegisterEmbeddedTestServerAndroid(JNIEnv* env) {
86 return RegisterNativesImpl(env); 89 return RegisterNativesImpl(env);
87 } 90 }
88 91
89 } // namespace test_server 92 } // namespace test_server
90 } // namespace net 93 } // namespace net
OLDNEW
« no previous file with comments | « net/test/embedded_test_server/android/embedded_test_server_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698