[Cronet] Remove CronetEngine.Builder JSON serial/deserialization APIs

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

 // Copyright 2014 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.content.Context;
 import android.os.ConditionVariable;
 import android.os.Environment;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
 
 import org.chromium.base.Log;
 import org.chromium.base.PathUtils;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.net.urlconnection.CronetURLStreamHandlerFactory;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.InputStream;
 
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
 import java.util.HashMap;
 
 /**
  * Framework for testing Cronet.
  */
 @SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
 public class CronetTestFramework {
     private static final String TAG = "CronetTestFramework";
 
     public static final String COMMAND_LINE_ARGS_KEY = "commandLineArgs";
     public static final String POST_DATA_KEY = "postData";
-    public static final String CONFIG_KEY = "config";
     public static final String CACHE_KEY = "cache";
     public static final String SDCH_KEY = "sdch";
 
     public static final String LIBRARY_INIT_KEY = "libraryInit";
     /**
       * Skips library initialization.
       */
     public static final String LIBRARY_INIT_SKIP = "skip";
 
     // Uses disk cache.
@@ skipping 49 matching lines @@
             mComplete.open();
         }
 
         public void blockForComplete() {
             mComplete.block();
         }
     }
 
     // TODO(crbug.com/547160): Fix this findbugs error and remove the suppression.
     @SuppressFBWarnings("EI_EXPOSE_REP2")
-    public CronetTestFramework(String appUrl, String[] commandLine, Context context) {
+    public CronetTestFramework(
+            String appUrl, String[] commandLine, Context context, CronetEngine.Builder builder) {
         mCommandLine = commandLine;
         mContext = context;
         prepareTestStorage();
 
         // 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 = initializeCronetEngineBuilder();
-        Log.i(TAG, "Using Config: " + mCronetEngineBuilder.toString());
+        mCronetEngineBuilder = initializeCronetEngineBuilderWithPresuppliedBuilder(builder);
 
         String initString = getCommandLineArg(LIBRARY_INIT_KEY);
         if (LIBRARY_INIT_SKIP.equals(initString)) {
             return;
         }
 
         mCronetEngine = initCronetEngine();
 
         if (LIBRARY_INIT_WRAPPER.equals(initString)) {
             mStreamHandlerFactory = new CronetURLStreamHandlerFactory(mCronetEngine);
         }
 
         mHistogramManager = HistogramManager.createHistogramManager();
 
         if (LIBRARY_INIT_CRONET_ONLY.equals(initString)) {
             return;
         }
 
         mRequestFactory = initRequestFactory();
         if (appUrl != null) {
             startWithURL(appUrl);
         }
     }
 
     /**
      * Prepares the path for the test storage (http cache, QUIC server info).
      */
     private void prepareTestStorage() {
-        File storage = new File(getTestStorage());
+        File storage = new File(getTestStorage(mContext));
         if (storage.exists()) {
             assertTrue(recursiveDelete(storage));
         }
         assertTrue(storage.mkdir());
     }
 
-    String getTestStorage() {
-        return PathUtils.getDataDirectory(mContext) + "/test_storage";
+    static String getTestStorage(Context context) {
+        return PathUtils.getDataDirectory(context) + "/test_storage";
     }
 
     @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
     private boolean recursiveDelete(File path) {
         if (path.isDirectory()) {
             for (File c : path.listFiles()) {
                 if (!recursiveDelete(c)) {
                     return false;
                 }
             }
         }
         return path.delete();
     }
 
     CronetEngine.Builder getCronetEngineBuilder() {
         return mCronetEngineBuilder;
     }
 
-    private CronetEngine.Builder initializeCronetEngineBuilder() {
-        return createCronetEngineBuilder(mContext);
+    private CronetEngine.Builder initializeCronetEngineBuilderWithPresuppliedBuilder(
+            CronetEngine.Builder builder) {
+        return createCronetEngineBuilderWithPresuppliedBuilder(mContext, builder);
     }
 
     CronetEngine.Builder createCronetEngineBuilder(Context context) {
-        CronetEngine.Builder cronetEngineBuilder = new CronetEngine.Builder(context);
+        return createCronetEngineBuilderWithPresuppliedBuilder(context, null);
+    }
+
+    private CronetEngine.Builder createCronetEngineBuilderWithPresuppliedBuilder(
+            Context context, CronetEngine.Builder cronetEngineBuilder) {
+        if (cronetEngineBuilder == null) {
+            cronetEngineBuilder = new CronetEngine.Builder(context);
+        }
         cronetEngineBuilder.enableHTTP2(true).enableQUIC(true);

[xunjieli, 2015/10/28 15:23:58]

Overwriting enableHTTP2 and QUIC here seems odd. It should be probably moved to
the if statement above.

[pauljensen, 2015/10/29 13:28:22]

Done.

 
-        // Override config if it is passed from the launcher.
-        String configString = getCommandLineArg(CONFIG_KEY);
-        if (configString != null) {
-            try {
-                cronetEngineBuilder = new CronetEngine.Builder(mContext, configString);
-            } catch (org.json.JSONException e) {
-                fail("Invalid Config." + e);
-                return null;
-            }
-        }
-
         String cacheString = getCommandLineArg(CACHE_KEY);
         if (CACHE_DISK.equals(cacheString)) {
-            cronetEngineBuilder.setStoragePath(getTestStorage());
+            cronetEngineBuilder.setStoragePath(getTestStorage(context));
             cronetEngineBuilder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK, 1000 * 1024);
         } else if (CACHE_DISK_NO_HTTP.equals(cacheString)) {
-            cronetEngineBuilder.setStoragePath(getTestStorage());
+            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);
@@ skipping 76 matching lines @@
 
     public void stopNetLog() {
         if (mRequestFactory != null) {
             mRequestFactory.stopNetLog();
         }
         if (mCronetEngine != null) {
             mCronetEngine.stopNetLog();
         }
     }
 }