Switched to new versions of netty and tcnative

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.net.smoke;
 
 import android.content.Context;
 
 import org.json.JSONObject;
 
 import org.chromium.base.Log;
 import org.chromium.net.CronetTestUtil;
 import org.chromium.net.ExperimentalCronetEngine;
 
 /**
  * Provides support for tests that depend on QUIC and HTTP2 servers.
  */
 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";
+
     @Override
     public TestServer createTestServer(Context context, Protocol protocol) {
         switch (protocol) {
             case QUIC:
                 return new QuicTestServer(context);
             case HTTP2:
                 return new Http2TestServer(context);
             case HTTP1:
                 return super.createTestServer(context, protocol);
             default:
@@ skipping 49 matching lines @@
     private static class Http2TestServer implements TestServer {
         private final Context mContext;
 
         Http2TestServer(Context context) {
             mContext = context;
         }
 
         @Override
         public boolean start() {
             try {
-                return org.chromium.net.Http2TestServer.startHttp2TestServer(mContext,
-                        org.chromium.net.QuicTestServer.getServerCert(),
-                        org.chromium.net.QuicTestServer.getServerCertKey());
+                return org.chromium.net.Http2TestServer.startHttp2TestServer(
+                        mContext, SERVER_CERT_PEM, SERVER_KEY_PKCS8_PEM);
             } catch (Exception e) {
                 Log.e(TAG, "Exception during Http2TestServer start", e);
                 return false;
             }
         }
 
         @Override
         public void shutdown() {
             try {
                 org.chromium.net.Http2TestServer.shutdownHttp2TestServer();
             } catch (Exception e) {
                 Log.e(TAG, "Exception during Http2TestServer shutdown", e);
             }
         }
 
         @Override
         public String getSuccessURL() {
             return org.chromium.net.Http2TestServer.getEchoMethodUrl();
         }
     }
 }