Switched to new versions of netty and tcnative

components/cronet/android/test/src/org/chromium/net/Http2TestServer.java

 // Copyright 2015 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;
 
 import android.content.Context;
 import android.os.ConditionVariable;
 
 import org.chromium.base.Log;
@@ skipping 86 matching lines @@
      * @return url of a brotli-encoded server resource.
      */
     public static String getServeSimpleBrotliResponse() {
         return getServerUrl() + Http2TestHandler.SERVE_SIMPLE_BROTLI_RESPONSE;
     }
 
     public static boolean startHttp2TestServer(
             Context context, String certFileName, String keyFileName) throws Exception {
         new Thread(
                 new Http2TestServerRunnable(new File(CertTestUtil.CERTS_DIRECTORY + certFileName),
-                        new File(CertTestUtil.CERTS_DIRECTORY + keyFileName)))
+                        new File(CertTestUtil.CERTS_DIRECTORY + keyFileName + ".pkcs8.pem")))

[mef, 2017/04/27 15:49:15]

Is this new format needed because Netty doesn't like the normal one?
Should we change caller to pass file name with ".pkcs8.pem"?

[kapishnikov, 2017/04/27 16:40:09]

Yes, netty requires PEM pkcs#8 format. It doesn't like pkcs#1. I think it is a
good idea to change the callers. There are 4 callers currently. All of them rely
on QuicTestServer.getServerCert(). I don't want to change QuicTestServer because
it has nothing to do with that.

Currently QuicTestServer defines a constant with the cert file name. We could do
something similar in Http2TestServer but it removes the flexibility of passing a
custom cert, which may be useful in the future.

                 .start();
         sBlock.block();
         return true;
     }
 
     private Http2TestServer() {}
 
     private static class Http2TestServerRunnable implements Runnable {
         private final SslContext mSslCtx;
 
@@ skipping 59 matching lines @@
                 throws Exception {
             if (ApplicationProtocolNames.HTTP_2.equals(protocol)) {
                 ctx.pipeline().addLast(new Http2TestHandler.Builder().build());
                 return;
             }
 
             throw new IllegalStateException("unknown protocol: " + protocol);
         }
     }
 }