[Cronet] Get Cronet performance test running again

components/cronet/android/test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java

Index: components/cronet/android/test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java
diff --git a/components/cronet/android/test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java b/components/cronet/android/test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java
index 775974e3f6c560202c38d5f671539af13773d71d..0b7b2ccbe243b13f786f58c9bb00f5d2b759e853 100644
--- a/components/cronet/android/test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java
+++ b/components/cronet/android/test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java
@@ -11,6 +11,8 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Debug;
 
+import org.chromium.base.PathUtils;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -38,6 +40,7 @@ import java.util.concurrent.TimeUnit;
  * Runs networking benchmarks and saves results to a file.
  */
 public class CronetPerfTestActivity extends Activity {
+    private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "cronet_perf_test";
     // Benchmark configuration passed down from host via Intent data.
     // Call getConfig*(key) to extract individual configuration values.
     private Uri mConfig;
@@ -160,31 +163,44 @@ public class CronetPerfTestActivity extends Activity {
                 default:
                     throw new IllegalArgumentException("Unknown size: " + size);
             }
+            final String scheme;
+            final String host;
             final int port;
             switch (protocol) {
                 case HTTP:
+                    scheme = "http";
+                    host = getConfigString("HOST_IP");
                     port = getConfigInt("HTTP_PORT");
                     break;
                 case QUIC:
+                    scheme = "https";
+                    host = getConfigString("HOST");
                     port = getConfigInt("QUIC_PORT");
                     break;
                 default:
                     throw new IllegalArgumentException("Unknown protocol: " + protocol);
             }
             try {
-                mUrl = new URL("http", getConfigString("HOST"), port, resource);
+                mUrl = new URL(scheme, host, port, resource);
             } catch (MalformedURLException e) {
-                throw new IllegalArgumentException("Bad URL: " + getConfigString("HOST") + ":"
-                        + port + "/" + resource);
+                throw new IllegalArgumentException(
+                        "Bad URL: " + host + ":" + port + "/" + resource);
             }
             final CronetEngine.Builder cronetEngineBuilder =
                     new CronetEngine.Builder(CronetPerfTestActivity.this);
+            cronetEngineBuilder.setLibraryName("cronet_tests");
             if (mProtocol == Protocol.QUIC) {
                 cronetEngineBuilder.enableQUIC(true);
-                cronetEngineBuilder.addQuicHint(getConfigString("HOST"), getConfigInt("QUIC_PORT"),
-                        getConfigInt("QUIC_PORT"));
+                cronetEngineBuilder.addQuicHint(host, port, port);
+                cronetEngineBuilder.setMockCertVerifierForTesting(
+                        MockCertVerifier.createMockCertVerifier(
+                                new String[] {getConfigString("QUIC_CERT_FILE")}));
             }
             mCronetEngine = cronetEngineBuilder.build();
+            long urlRequestContextAdapter =
+                    ((CronetUrlRequestContext) mCronetEngine).getUrlRequestContextAdapter();
+            NativeTestServer.registerHostResolverProc(

[mef, 2015/12/29 17:27:45]

registerHostResolverProc doesn't really have anything to do with
NativeTestServer apart from historical location.
I wonder whether it belongs to CronetTestUtil or somesuch?

[pauljensen, 2016/01/21 03:51:50]

Done.

+                    urlRequestContextAdapter, false, getConfigString("HOST_IP"));
             mName = buildBenchmarkName(mode, direction, protocol, concurrency, mIterations);
             mConcurrency = concurrency;
             mResults = results;
@@ -582,6 +598,7 @@ public class CronetPerfTestActivity extends Activity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX, this);
         mConfig = getIntent().getData();
         // Execute benchmarks on another thread to avoid networking on main thread.
         new BenchmarkTask().execute();