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

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

Issue 1378123003: Adding SSL ETS Tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ets
Patch Set: Rebase. 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 unified diff | Download patch
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/trace_event/trace_event.h" 11 #include "base/trace_event/trace_event.h"
12 #include "net/test/jni/EmbeddedTestServer_jni.h" 12 #include "net/test/jni/EmbeddedTestServer_jni.h"
13 13
14 namespace net { 14 namespace net {
15 namespace test_server { 15 namespace test_server {
16 16
17 EmbeddedTestServerAndroid::EmbeddedTestServerAndroid(JNIEnv* env, jobject jobj) 17 EmbeddedTestServerAndroid::EmbeddedTestServerAndroid(JNIEnv* env, jobject jobj)
18 : weak_java_server_(env, jobj), test_server_() { 18 : weak_java_server_(env, jobj), test_server_() {
19 Java_EmbeddedTestServer_setNativePtr(env, jobj, 19 Java_EmbeddedTestServer_setNativePtr(env, jobj,
20 reinterpret_cast<intptr_t>(this)); 20 reinterpret_cast<intptr_t>(this));
21 } 21 }
22 22
23 EmbeddedTestServerAndroid::~EmbeddedTestServerAndroid() { 23 EmbeddedTestServerAndroid::~EmbeddedTestServerAndroid() {
24 JNIEnv* env = base::android::AttachCurrentThread(); 24 JNIEnv* env = base::android::AttachCurrentThread();
25 Java_EmbeddedTestServer_clearNativePtr(env, weak_java_server_.get(env).obj()); 25 Java_EmbeddedTestServer_clearNativePtr(env, weak_java_server_.get(env).obj());
26 } 26 }
27 27
28 jboolean EmbeddedTestServerAndroid::InitializeAndWaitUntilReady(JNIEnv* env, 28 jboolean EmbeddedTestServerAndroid::Start(JNIEnv* env, jobject jobj) {
29 jobject jobj) { 29 return test_server_.Start();
30 return test_server_.InitializeAndWaitUntilReady();
31 } 30 }
32 31
33 jboolean EmbeddedTestServerAndroid::ShutdownAndWaitUntilComplete(JNIEnv* env, 32 jboolean EmbeddedTestServerAndroid::ShutdownAndWaitUntilComplete(JNIEnv* env,
34 jobject jobj) { 33 jobject jobj) {
35 return test_server_.ShutdownAndWaitUntilComplete(); 34 return test_server_.ShutdownAndWaitUntilComplete();
36 } 35 }
37 36
38 base::android::ScopedJavaLocalRef<jstring> EmbeddedTestServerAndroid::GetURL( 37 base::android::ScopedJavaLocalRef<jstring> EmbeddedTestServerAndroid::GetURL(
39 JNIEnv* env, 38 JNIEnv* env,
40 jobject jobj, 39 jobject jobj,
(...skipping 21 matching lines...) Expand all
62 new EmbeddedTestServerAndroid(env, jobj); 61 new EmbeddedTestServerAndroid(env, jobj);
63 } 62 }
64 63
65 // static 64 // static
66 bool EmbeddedTestServerAndroid::RegisterEmbeddedTestServerAndroid(JNIEnv* env) { 65 bool EmbeddedTestServerAndroid::RegisterEmbeddedTestServerAndroid(JNIEnv* env) {
67 return RegisterNativesImpl(env); 66 return RegisterNativesImpl(env);
68 } 67 }
69 68
70 } // namespace test_server 69 } // namespace test_server
71 } // namespace net 70 } // namespace net
OLDNEW
« no previous file with comments | « net/test/embedded_test_server/android/embedded_test_server_android.h ('k') | net/url_request/url_fetcher_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698