net/test/embedded_test_server/android/embedded_test_server_android.cc - Issue 1378123003: Adding SSL ETS Tests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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, 2 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 side-by-side diff with in-line comments

Download patch

« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 9ba38862e8e47a1444ec5d7c28864ff703e02804..86ef5bdde648154f5fa4dc81726d7b0fa8b5c141 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

@@ -25,9 +25,8 @@ EmbeddedTestServerAndroid::~EmbeddedTestServerAndroid() {

Java_EmbeddedTestServer_clearNativePtr(env, weak_java_server_.get(env).obj());

}

-jboolean EmbeddedTestServerAndroid::InitializeAndWaitUntilReady(JNIEnv* env,

- jobject jobj) {

- return test_server_.InitializeAndWaitUntilReady();

+jboolean EmbeddedTestServerAndroid::Start(JNIEnv* env, jobject jobj) {

+ return test_server_.Start();

}

jboolean EmbeddedTestServerAndroid::ShutdownAndWaitUntilComplete(JNIEnv* env,