[Cronet] Create Builders, rename UrlRequestContext to CronetEngine

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 93 matching lines @@
         return name;
     }
 
     // Responsible for running one particular benchmark and timing it.
     private class Benchmark {
         private final Mode mMode;
         private final Direction mDirection;
         private final Protocol mProtocol;
         private final URL mUrl;
         private final String mName;
-        private final UrlRequestContext mCronetContext;
+        private final CronetEngine mCronetEngine;
         // Size in bytes of content being uploaded or downloaded.
         private final int mLength;
         // How many requests to execute.
         private final int mIterations;
         // How many requests to execute in parallel at any one time.
         private final int mConcurrency;
         // Dictionary of benchmark names mapped to times to complete the benchmarks.
         private final JSONObject mResults;
         // How large a buffer to use for passing content, in bytes.
         private final int mBufferSize;
@@ skipping 46 matching lines @@
                     break;
                 default:
                     throw new IllegalArgumentException("Unknown protocol: " + protocol);
             }
             try {
                 mUrl = new URL("http", getConfigString("HOST"), port, resource);
             } catch (MalformedURLException e) {
                 throw new IllegalArgumentException("Bad URL: " + getConfigString("HOST") + ":"
                         + port + "/" + resource);
             }
-            final UrlRequestContextConfig cronetConfig = new UrlRequestContextConfig();
+            final CronetEngine.Builder cronetEngineBuilder = new CronetEngine.Builder();
             if (mProtocol == Protocol.QUIC) {
-                cronetConfig.enableQUIC(true);
-                cronetConfig.addQuicHint(getConfigString("HOST"), getConfigInt("QUIC_PORT"),
+                cronetEngineBuilder.enableQUIC(true);
+                cronetEngineBuilder.addQuicHint(getConfigString("HOST"), getConfigInt("QUIC_PORT"),
                         getConfigInt("QUIC_PORT"));
             }
-            mCronetContext = new CronetUrlRequestContext(CronetPerfTestActivity.this, cronetConfig);
+            mCronetEngine = cronetEngineBuilder.build(CronetPerfTestActivity.this);
             mName = buildBenchmarkName(mode, direction, protocol, concurrency, mIterations);
             mConcurrency = concurrency;
             mResults = results;
             mBufferSize = mLength > getConfigInt("MAX_BUFFER_SIZE")
                     ? getConfigInt("MAX_BUFFER_SIZE")
                     : mLength;
             mUseNetworkThread = getConfigBoolean("CRONET_ASYNC_USE_NETWORK_THREAD");
         }
 
         private void startTimer() {
@@ skipping 11 matching lines @@
                 mResults.put(mName, mStopTimeMs - mStartTimeMs);
             } catch (JSONException e) {
                 System.out.println("Failed to write JSON result for " + mName);
             }
         }
 
         // TODO(pauljensen): Remove @SuppressLint once crbug.com/501591 is fixed.
         @SuppressLint("NewApi")
         private void startLogging() {
             if (getConfigBoolean("CAPTURE_NETLOG")) {
-                mCronetContext.startNetLogToFile(getFilesDir().getPath() + "/" + mName + ".json",
-                        false);
+                mCronetEngine.startNetLogToFile(
+                        getFilesDir().getPath() + "/" + mName + ".json", false);
             }
             if (getConfigBoolean("CAPTURE_TRACE")) {
                 Debug.startMethodTracing(getFilesDir().getPath() + "/" + mName + ".trace");
             } else if (getConfigBoolean("CAPTURE_SAMPLED_TRACE")) {
                 Debug.startMethodTracingSampling(
                         getFilesDir().getPath() + "/" + mName + ".trace", 8000000, 10);
             }
         }
 
         private void stopLogging() {
             if (getConfigBoolean("CAPTURE_NETLOG")) {
-                mCronetContext.stopNetLog();
+                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 buffer A buffer of length |mBufferSize| to use for transfer.
@@ skipping 93 matching lines @@
                         });
                     }
                     return;
                 }
                 mRemainingRequests--;
                 final Runnable completionCallback = new Runnable() {
                     public void run() {
                         initiateRequest(buffer);
                     }
                 };
-                final UrlRequest request = mCronetContext.createRequest(mUrl.toString(),
+                final UrlRequest.Builder builder = new UrlRequest.Builder(mUrl.toString(),
                         new Listener(buffer, completionCallback), mWorkQueueExecutor);
                 if (mDirection == Direction.UP) {
-                    request.setUploadDataProvider(new Uploader(buffer), mWorkQueueExecutor);
-                    request.addHeader("Content-Type", "application/octet-stream");
+                    builder.setUploadDataProvider(new Uploader(buffer), mWorkQueueExecutor);
+                    builder.addHeader("Content-Type", "application/octet-stream");
                 }
-                request.start();
+                mCronetEngine.executeRequest(builder);

[xunjieli, 2015/10/01 19:00:09]

need to update tests?

[pauljensen, 2015/10/01 23:42:59]

Done.

             }
 
             private class Uploader extends UploadDataProvider {
                 private final ByteBuffer mBuffer;
                 private int mRemainingBytes;
 
                 Uploader(ByteBuffer buffer) {
                     mBuffer = buffer;
                     mRemainingBytes = mLength;
                 }
@@ skipping 109 matching lines @@
             startLogging();
             // Prepare list of tasks to run.
             switch (mMode) {
                 case SYSTEM_HUC:
                     for (int i = 0; i < mIterations; i++) {
                         tasks.add(new SystemHttpURLConnectionFetchTask());
                     }
                     break;
                 case CRONET_HUC: {
                     final CronetHttpURLStreamHandler cronetStreamHandler =
-                            new CronetHttpURLStreamHandler(mCronetContext);
+                            new CronetHttpURLStreamHandler(mCronetEngine);
                     for (int i = 0; i < mIterations; i++) {
                         tasks.add(new CronetHttpURLConnectionFetchTask(cronetStreamHandler));
                     }
                     break;
                 }
                 case CRONET_ASYNC:
                     tasks.add(new CronetAsyncFetchTask());
                     break;
                 default:
                     throw new IllegalArgumentException("Unknown mode: " + mMode);
@@ skipping 93 matching lines @@
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mConfig = getIntent().getData();
         // Execute benchmarks on another thread to avoid networking on main thread.
         new BenchmarkTask().execute();
     }
 }