[Cronet] Expose HttpURLConnection API from CronetEngine, not classes

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;
 import android.os.Bundle;
 import android.os.Debug;
 
-import org.chromium.net.urlconnection.CronetHttpURLStreamHandler;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
@@ skipping 260 matching lines @@
                 } catch (IOException e) {
                     System.out.println("System HttpURLConnection failed with " + e);
                     return false;
                 }
             }
         }
 
         // GET or POST to one particular URL using Cronet HttpURLConnection API
         private class CronetHttpURLConnectionFetchTask implements Callable<Boolean> {
             private final byte[] mBuffer = new byte[mBufferSize];
-            private final CronetHttpURLStreamHandler mStreamHandler;
-
-            public CronetHttpURLConnectionFetchTask(
-                    CronetHttpURLStreamHandler cronetStreamHandler) {
-                mStreamHandler = cronetStreamHandler;
-            }
 
             @Override
             public Boolean call() {
                 try {
-                    return exerciseHttpURLConnection(mStreamHandler.openConnection(mUrl), mBuffer);
+                    return exerciseHttpURLConnection(mCronetEngine.openConnection(mUrl), mBuffer);
                 } catch (IOException e) {
                     System.out.println("Cronet HttpURLConnection failed with " + e);
                     return false;
                 }
             }
         }
 
         // GET or POST to one particular URL using Cronet's asynchronous API
         private class CronetAsyncFetchTask implements Callable<Boolean> {
             // A message-queue for asynchronous tasks to post back to.
@@ skipping 157 matching lines @@
             final List<Callable<Boolean>> tasks = new ArrayList<Callable<Boolean>>(mIterations);
             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(mCronetEngine);
                     for (int i = 0; i < mIterations; i++) {
-                        tasks.add(new CronetHttpURLConnectionFetchTask(cronetStreamHandler));
+                        tasks.add(new CronetHttpURLConnectionFetchTask());
                     }
                     break;
                 }
                 case CRONET_ASYNC:
                     tasks.add(new CronetAsyncFetchTask());
                     break;
                 default:
                     throw new IllegalArgumentException("Unknown mode: " + mMode);
             }
             // Execute tasks.
@@ skipping 91 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();
     }
 }