[Cronet] Clean up tests

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

Index: components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java
diff --git a/components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java b/components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java
index 678c70be20382e127d14adf3d7dadff09c273bbc..db75e32067867e3caa9e69329620a42693047b89 100644
--- a/components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java
+++ b/components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java
@@ -7,16 +7,13 @@ package org.chromium.net;
 import android.content.Context;
 import android.os.Environment;
 
-import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
 
-import org.chromium.base.Log;
 import org.chromium.base.PathUtils;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.net.impl.CronetEngineBase;
 
 import java.io.File;
-import java.net.URLStreamHandlerFactory;
 
 /**
  * Framework for testing Cronet.
@@ -25,86 +22,19 @@ import java.net.URLStreamHandlerFactory;
 public class CronetTestFramework {
     private static final String TAG = CronetTestFramework.class.getSimpleName();
 
-    public static final String COMMAND_LINE_ARGS_KEY = "commandLineArgs";
-    public static final String POST_DATA_KEY = "postData";
-    public static final String CACHE_KEY = "cache";
-    public static final String SDCH_KEY = "sdch";
-    public static final String LIBRARY_INIT_KEY = "libraryInit";
-
-    // Uses disk cache.
-    public static final String CACHE_DISK = "disk";
-
-    // Uses disk cache but does not store http data.
-    public static final String CACHE_DISK_NO_HTTP = "diskNoHttp";
-
-    // Uses in-memory cache.
-    public static final String CACHE_IN_MEMORY = "memory";
-
-    // Enables Sdch.
-    public static final String SDCH_ENABLE = "enable";
-
-    /**
-     * Library init type strings to use along with {@link #LIBRARY_INIT_KEY}.
-     * If unspecified, {@link LibraryInitType#CRONET} will be used.
-     */
-    public static final class LibraryInitType {
-        // Initializes Cronet Async API.
-        public static final String CRONET = "cronet";
-        // Initializes Cronet HttpURLConnection API.
-        public static final String HTTP_URL_CONNECTION = "http_url_connection";
-        // Do not initialize.
-        public static final String NONE = "none";
-
-        private LibraryInitType() {}
-    }
-
-    public URLStreamHandlerFactory mStreamHandlerFactory;
     public CronetEngineBase mCronetEngine;
 
-    private final String[] mCommandLine;
     private final Context mContext;
 
-    // CronetEngine.Builder used for this activity.
-    private ExperimentalCronetEngine.Builder mCronetEngineBuilder;
-
-    // TODO(crbug.com/547160): Fix this findbugs error and remove the suppression.
-    @SuppressFBWarnings("EI_EXPOSE_REP2")
-    public CronetTestFramework(String appUrl, String[] commandLine, Context context,
-            ExperimentalCronetEngine.Builder builder) {
-        mCommandLine = commandLine;
+    public CronetTestFramework(Context context, ExperimentalCronetEngine.Builder builder) {
         mContext = context;
-
-        // Print out extra arguments passed in starting this activity.
-        if (commandLine != null) {
-            assertEquals(0, commandLine.length % 2);
-            for (int i = 0; i < commandLine.length / 2; i++) {
-                Log.i(TAG, "Cronet commandLine %s = %s", commandLine[i * 2],
-                        commandLine[i * 2 + 1]);
-            }
-        }
-
-        // Initializes CronetEngine.Builder from commandLine args.
-        mCronetEngineBuilder = initializeCronetEngineBuilderWithPresuppliedBuilder(builder);
-
-        String initString = getCommandLineArg(LIBRARY_INIT_KEY);
-
-        if (initString == null) {
-            initString = LibraryInitType.CRONET;
-        }
-
-        switch (initString) {
-            case LibraryInitType.NONE:
-                break;
-            case LibraryInitType.HTTP_URL_CONNECTION:
-                mCronetEngine = initCronetEngine();
-                mStreamHandlerFactory = mCronetEngine.createURLStreamHandlerFactory();
-                break;
-            default:
-                mCronetEngine = initCronetEngine();
-                // Start collecting metrics.
-                mCronetEngine.getGlobalMetricsDeltas();
-                break;
+        if (builder == null) {
+            builder = new ExperimentalCronetEngine.Builder(context);
+            builder.enableHttp2(true).enableQuic(true);
         }
+        mCronetEngine = (CronetEngineBase) builder.build();
+        // Start collecting metrics.
+        mCronetEngine.getGlobalMetricsDeltas();
     }
 
     /**
@@ -157,63 +87,6 @@ public class CronetTestFramework {
         return path.delete();
     }
 
-    ExperimentalCronetEngine.Builder getCronetEngineBuilder() {
-        return mCronetEngineBuilder;
-    }
-
-    private ExperimentalCronetEngine.Builder initializeCronetEngineBuilderWithPresuppliedBuilder(
-            ExperimentalCronetEngine.Builder builder) {
-        return createCronetEngineBuilderWithPresuppliedBuilder(mContext, builder);
-    }
-
-    ExperimentalCronetEngine.Builder createCronetEngineBuilder(Context context) {
-        return createCronetEngineBuilderWithPresuppliedBuilder(context, null);
-    }
-
-    private ExperimentalCronetEngine.Builder createCronetEngineBuilderWithPresuppliedBuilder(
-            Context context, ExperimentalCronetEngine.Builder cronetEngineBuilder) {
-        if (cronetEngineBuilder == null) {
-            cronetEngineBuilder = new ExperimentalCronetEngine.Builder(context);
-            cronetEngineBuilder.enableHttp2(true).enableQuic(true);
-        }
-
-        String cacheString = getCommandLineArg(CACHE_KEY);
-        if (CACHE_DISK.equals(cacheString)) {
-            cronetEngineBuilder.setStoragePath(getTestStorage(context));
-            cronetEngineBuilder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK, 1000 * 1024);
-        } else if (CACHE_DISK_NO_HTTP.equals(cacheString)) {
-            cronetEngineBuilder.setStoragePath(getTestStorage(context));
-            cronetEngineBuilder.enableHttpCache(
-                    CronetEngine.Builder.HTTP_CACHE_DISK_NO_HTTP, 1000 * 1024);
-        } else if (CACHE_IN_MEMORY.equals(cacheString)) {
-            cronetEngineBuilder.enableHttpCache(
-                    CronetEngine.Builder.HTTP_CACHE_IN_MEMORY, 100 * 1024);
-        }
-
-        String sdchString = getCommandLineArg(SDCH_KEY);
-        if (SDCH_ENABLE.equals(sdchString)) {
-            cronetEngineBuilder.enableSdch(true);
-        }
-
-        return cronetEngineBuilder;
-    }
-
-    // Helper function to initialize Cronet engine. Also used in testing.
-    public CronetEngineBase initCronetEngine() {
-        return (CronetEngineBase) mCronetEngineBuilder.build();
-    }
-
-    private String getCommandLineArg(String key) {
-        if (mCommandLine != null) {
-            for (int i = 0; i < mCommandLine.length; ++i) {
-                if (mCommandLine[i].equals(key)) {
-                    return mCommandLine[++i];
-                }
-            }
-        }
-        return null;
-    }
-
     public void startNetLog() {

[mgersh, 2017/05/23 18:12:13]

This class is kind of a strange combination of things: it can create a
CronetEngine with some nice default settings, it can start a netlog but only if
you used it for the default CronetEngine settings, and it has some static
methods related to storage. In my ideal world it would all live in
CronetTestBase. Most of that could be a future cleanup, but I think it's worth
moving the netlog stuff now since this refactor makes those methods not usable
for a lot of tests where you could previously use them.

[pauljensen, 2017/05/25 15:15:15]

Done, netlog stuff was actually dead, so I just moved the rest into
CronetTestBase.

         if (mCronetEngine != null) {
             mCronetEngine.startNetLogToFile(Environment.getExternalStorageDirectory().getPath()