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

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

Issue 2237943002: Remove now-unnecessary .obj() in Java method calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch-context
Patch Set: Rebase *again* :( Created 4 years, 4 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/proxy/proxy_config_service_android.cc ('k') | printing/printing_context_android.cc » ('j') | 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 16
17 namespace net { 17 namespace net {
18 namespace test_server { 18 namespace test_server {
19 19
20 EmbeddedTestServerAndroid::EmbeddedTestServerAndroid(JNIEnv* env, jobject jobj) 20 EmbeddedTestServerAndroid::EmbeddedTestServerAndroid(JNIEnv* env, jobject jobj)
21 : weak_java_server_(env, jobj), test_server_() { 21 : weak_java_server_(env, jobj), test_server_() {
22 Java_EmbeddedTestServerImpl_setNativePtr(env, jobj, 22 Java_EmbeddedTestServerImpl_setNativePtr(env, jobj,
23 reinterpret_cast<intptr_t>(this)); 23 reinterpret_cast<intptr_t>(this));
24 } 24 }
25 25
26 EmbeddedTestServerAndroid::~EmbeddedTestServerAndroid() { 26 EmbeddedTestServerAndroid::~EmbeddedTestServerAndroid() {
27 JNIEnv* env = base::android::AttachCurrentThread(); 27 JNIEnv* env = base::android::AttachCurrentThread();
28 Java_EmbeddedTestServerImpl_clearNativePtr(env, 28 Java_EmbeddedTestServerImpl_clearNativePtr(env, weak_java_server_.get(env));
29 weak_java_server_.get(env).obj());
30 } 29 }
31 30
32 jboolean EmbeddedTestServerAndroid::Start(JNIEnv* env, 31 jboolean EmbeddedTestServerAndroid::Start(JNIEnv* env,
33 const JavaParamRef<jobject>& jobj) { 32 const JavaParamRef<jobject>& jobj) {
34 return test_server_.Start(); 33 return test_server_.Start();
35 } 34 }
36 35
37 jboolean EmbeddedTestServerAndroid::ShutdownAndWaitUntilComplete( 36 jboolean EmbeddedTestServerAndroid::ShutdownAndWaitUntilComplete(
38 JNIEnv* env, 37 JNIEnv* env,
39 const JavaParamRef<jobject>& jobj) { 38 const JavaParamRef<jobject>& jobj) {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 new EmbeddedTestServerAndroid(env, jobj); 81 new EmbeddedTestServerAndroid(env, jobj);
83 } 82 }
84 83
85 // static 84 // static
86 bool EmbeddedTestServerAndroid::RegisterEmbeddedTestServerAndroid(JNIEnv* env) { 85 bool EmbeddedTestServerAndroid::RegisterEmbeddedTestServerAndroid(JNIEnv* env) {
87 return RegisterNativesImpl(env); 86 return RegisterNativesImpl(env);
88 } 87 }
89 88
90 } // namespace test_server 89 } // namespace test_server
91 } // namespace net 90 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/proxy_config_service_android.cc ('k') | printing/printing_context_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698