Cronet API Refactoring

components/cronet/android/test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.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.annotation.SuppressLint;
 import android.app.Activity;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ skipping 169 matching lines @@
                     break;
                 default:
                     throw new IllegalArgumentException("Unknown protocol: " + protocol);
             }
             try {
                 mUrl = new URL(scheme, host, port, resource);
             } catch (MalformedURLException e) {
                 throw new IllegalArgumentException(
                         "Bad URL: " + host + ":" + port + "/" + resource);
             }
-            final CronetEngine.Builder cronetEngineBuilder =
-                    new CronetEngine.Builder(CronetPerfTestActivity.this);
-            cronetEngineBuilder.setLibraryName("cronet_tests");
+            final ExperimentalCronetEngine.Builder cronetEngineBuilder =
+                    new ExperimentalCronetEngine.Builder(CronetPerfTestActivity.this);
+            CronetTestUtil.setLibraryName(cronetEngineBuilder, "cronet_tests");
             if (mProtocol == Protocol.QUIC) {
                 cronetEngineBuilder.enableQuic(true);
                 cronetEngineBuilder.addQuicHint(host, port, port);
-                cronetEngineBuilder.setMockCertVerifierForTesting(
+                CronetTestUtil.setMockCertVerifierForTesting(cronetEngineBuilder,
                         MockCertVerifier.createMockCertVerifier(
                                 new String[] {getConfigString("QUIC_CERT_FILE")}, true));
             }
 
             try {
                 JSONObject quicParams = new JSONObject().put("host_whitelist", host);
                 JSONObject hostResolverParams =
                         CronetTestUtil.generateHostResolverRules(getConfigString("HOST_IP"));
                 JSONObject experimentalOptions =
                         new JSONObject()
@@ skipping 50 matching lines @@
             if (getConfigBoolean("CAPTURE_NETLOG")) {
                 mCronetEngine.stopNetLog();
             }
             if (getConfigBoolean("CAPTURE_TRACE") || getConfigBoolean("CAPTURE_SAMPLED_TRACE")) {
                 Debug.stopMethodTracing();
             }
         }
 
         /**
          * Transfer {@code mLength} bytes through HttpURLConnection in {@code mDirection} direction.
-         * @param connection The HttpURLConnection to use for transfer.
+         * @param urlConnection The HttpURLConnection to use for transfer.
          * @param buffer A buffer of length |mBufferSize| to use for transfer.
          * @return {@code true} if transfer completed successfully.
          */
         private boolean exerciseHttpURLConnection(URLConnection urlConnection, byte[] buffer)
                 throws IOException {
             final HttpURLConnection connection = (HttpURLConnection) urlConnection;
             try {
                 int bytesTransfered = 0;
                 if (mDirection == Direction.DOWN) {
                     final InputStream inputStream = connection.getInputStream();
@@ skipping 79 matching lines @@
                     }
                     return;
                 }
                 mRemainingRequests--;
                 final Runnable completionCallback = new Runnable() {
                     @Override
                     public void run() {
                         initiateRequest(buffer);
                     }
                 };
-                final UrlRequest.Builder builder = new UrlRequest.Builder(mUrl.toString(),
-                        new Callback(buffer, completionCallback), mWorkQueueExecutor,
-                        mCronetEngine);
+                final UrlRequest.Builder builder =
+                        mCronetEngine.newUrlRequestBuilder(mUrl.toString(),
+                                new Callback(buffer, completionCallback), mWorkQueueExecutor);
                 if (mDirection == Direction.UP) {
                     builder.setUploadDataProvider(new Uploader(buffer), mWorkQueueExecutor);
                     builder.addHeader("Content-Type", "application/octet-stream");
                 }
                 builder.build().start();
             }
 
             private class Uploader extends UploadDataProvider {
                 private final ByteBuffer mBuffer;
                 private int mRemainingBytes;
@@ skipping 240 matching lines @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         // Initializing application context here due to lack of custom CronetPerfTestApplication.
         ContextUtils.initApplicationContext(getApplicationContext());
         PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX);
         mConfig = getIntent().getData();
         // Execute benchmarks on another thread to avoid networking on main thread.
         new BenchmarkTask().execute();
     }
 }