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

Unified Diff: components/cronet/android/test/smoketests/src/org/chromium/net/smoke/ChromiumNativeTestSupport.java

Issue 2843293002: Switched to new versions of netty and tcnative (Closed)
Patch Set: Added Http2Server certificate constants to the test base class. Created 3 years, 8 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
Index: components/cronet/android/test/smoketests/src/org/chromium/net/smoke/ChromiumNativeTestSupport.java
diff --git a/components/cronet/android/test/smoketests/src/org/chromium/net/smoke/ChromiumNativeTestSupport.java b/components/cronet/android/test/smoketests/src/org/chromium/net/smoke/ChromiumNativeTestSupport.java
index d130350b6860e967ea8dd7f8454723fe21d7e5f3..5386e8d45ec68fe34a59256051f49e2ab1b85704 100644
--- a/components/cronet/android/test/smoketests/src/org/chromium/net/smoke/ChromiumNativeTestSupport.java
+++ b/components/cronet/android/test/smoketests/src/org/chromium/net/smoke/ChromiumNativeTestSupport.java
@@ -18,6 +18,16 @@ import org.chromium.net.ExperimentalCronetEngine;
class ChromiumNativeTestSupport extends ChromiumPlatformOnlyTestSupport {
private static final String TAG = ChromiumNativeTestSupport.class.getSimpleName();
+ /**
+ * Name of the file that contains the test server certificate in PEM format.
+ */
+ private static final String SERVER_CERT_PEM = "quic_test.example.com.crt";
+
+ /**
+ * Name of the file that contains the test server private key in PKCS8 PEM format.
+ */
+ private static final String SERVER_KEY_PKCS8_PEM = "quic_test.example.com.key.pkcs8.pem";
mef 2017/04/27 18:54:19 nit: spurious space.
kapishnikov 2017/04/27 19:45:08 Done.
+
@Override
public TestServer createTestServer(Context context, Protocol protocol) {
switch (protocol) {
@@ -88,8 +98,7 @@ class ChromiumNativeTestSupport extends ChromiumPlatformOnlyTestSupport {
public boolean start() {
try {
return org.chromium.net.Http2TestServer.startHttp2TestServer(mContext,
- org.chromium.net.QuicTestServer.getServerCert(),
- org.chromium.net.QuicTestServer.getServerCertKey());
+ SERVER_CERT_PEM, SERVER_KEY_PKCS8_PEM);
} catch (Exception e) {
Log.e(TAG, "Exception during Http2TestServer start", e);
return false;

Powered by Google App Engine
This is Rietveld 408576698