Revert of Move CronetTestBase#prepareTestStorage to CronetTestActivity (patchset #6 id:120001 of https://codereview.chromium.org/1120063003/)

Reason for revert:
Possible culprit for compilation failure (http://build.chromium.org/p/chromium.linux/builders/Android%20Clang%20Builder%20%28dbg%29/builds/59208/steps/compile/logs/stdio)

Original issue's description:
> Move CronetTestBase#prepareTestStorage to CronetTestActivity
>
> prepareTestStorage() is sometimes called before activity is
> launched to initialize UrlRequestContextConfig. This
> creates a race where we call PathUtils#getDataDirectory
> before PathUtils#setPrivateDataDirectorySuffix is invoked in
> CronetTestApplication#onCreate. This CL moves
> prepareTestStorage to activity to avoid this race.
>
> This CL also initializes
> CronetTestActivity.mStreamHandlerFactory when needed.
> This is to avoid having two live CronetUrlRequestContexts
> at once.
> BUG=482813, 485100
>
> Committed: https://crrev.com/743ec3bdabdd1b0dd0813d42aea00020a2e25b3b
> Cr-Commit-Position: refs/heads/master@{#328816}

TBR=mef@chromium.org,xunjieli@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=482813, 485100

Review URL: https://codereview.chromium.org/1136573003

Cr-Commit-Position: refs/heads/master@{#328819}

8 files changed, 102 insertions, 128 deletions

diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/ContextInitTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/ContextInitTest.java
index 439ea51..638bb81 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/ContextInitTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/ContextInitTest.java
@@ -24,7 +24,7 @@ public class ContextInitTest extends CronetTestBase {
     @SmallTest
     @Feature({"Cronet"})
     public void testInitFactoryAndStartRequest() {
-        CronetTestActivity activity = launchCronetTestAppAndSkipFactoryInit();
+        CronetTestActivity activity = skipFactoryInitInOnCreate();
 
         // Immediately make a request after initializing the factory.
         HttpUrlRequestFactory factory = activity.initRequestFactory();
@@ -36,7 +36,7 @@ public class ContextInitTest extends CronetTestBase {
     @SmallTest
     @Feature({"Cronet"})
     public void testInitFactoryStartRequestAndCancel() {
-        CronetTestActivity activity = launchCronetTestAppAndSkipFactoryInit();
+        CronetTestActivity activity = skipFactoryInitInOnCreate();
 
         // Make a request and cancel it after initializing the factory.
         HttpUrlRequestFactory factory = activity.initRequestFactory();
@@ -53,7 +53,7 @@ public class ContextInitTest extends CronetTestBase {
     @SmallTest
     @Feature({"Cronet"})
     public void testInitFactoryStartTwoRequests() throws Exception {
-        CronetTestActivity activity = launchCronetTestAppAndSkipFactoryInit();
+        CronetTestActivity activity = skipFactoryInitInOnCreate();
 
         // Make two request right after initializing the factory.
         int[] statusCodes = {0, 0};
@@ -90,7 +90,7 @@ public class ContextInitTest extends CronetTestBase {
     @SmallTest
     @Feature({"Cronet"})
     public void testInitTwoFactoriesSimultaneously() throws Exception {
-        final CronetTestActivity activity = launchCronetTestAppAndSkipFactoryInit();
+        final CronetTestActivity activity = skipFactoryInitInOnCreate();
 
         RequestThread thread1 = new RequestThread(activity, URL);
         RequestThread thread2 = new RequestThread(activity, URL_404);
@@ -106,7 +106,7 @@ public class ContextInitTest extends CronetTestBase {
     @SmallTest
     @Feature({"Cronet"})
     public void testInitTwoFactoriesInSequence() throws Exception {
-        final CronetTestActivity activity = launchCronetTestAppAndSkipFactoryInit();
+        final CronetTestActivity activity = skipFactoryInitInOnCreate();
 
         RequestThread thread1 = new RequestThread(activity, URL);
         RequestThread thread2 = new RequestThread(activity, URL_404);
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java
index 2c044fa..7bd5982 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java
@@ -11,6 +11,9 @@ import android.test.ActivityInstrumentationTestCase2;
 
 import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
 
+import org.chromium.base.PathUtils;
+
+import java.io.File;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -81,7 +84,7 @@ public class CronetTestBase extends
     }
 
     // Helper method to tell the activity to skip factory init in onCreate().
-    protected CronetTestActivity launchCronetTestAppAndSkipFactoryInit() {
+    protected CronetTestActivity skipFactoryInitInOnCreate() {
         String[] commandLineArgs = {
                 CronetTestActivity.LIBRARY_INIT_KEY, CronetTestActivity.LIBRARY_INIT_SKIP};
         CronetTestActivity activity =
@@ -153,6 +156,31 @@ public class CronetTestBase extends
         }
     }
 
+    /**
+     * Returns the path for the test storage (http cache, QUIC server info).
+     */
+    public String prepareTestStorage() {
+        String storagePath = PathUtils.getDataDirectory(
+                getInstrumentation().getTargetContext()) + "/test_storage";
+        File storage = new File(storagePath);
+        if (storage.exists()) {
+            assertTrue(recursiveDelete(storage));
+        }
+        assertTrue(storage.mkdir());
+        return storagePath;
+    }
+
+    boolean recursiveDelete(File path) {
+        if (path.isDirectory()) {
+            for (File c : path.listFiles()) {
+                if (!recursiveDelete(c)) {
+                    return false;
+                }
+            }
+        }
+        return path.delete();
+    }
+
     @Target(ElementType.METHOD)
     @Retention(RetentionPolicy.RUNTIME)
     public @interface CompareDefaultWithCronet {
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
index d458698..91978f2 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
@@ -153,7 +153,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
     @SmallTest
     @Feature({"Cronet"})
     public void testShutdownDuringInit() throws Exception {
-        final CronetTestActivity activity = launchCronetTestAppAndSkipFactoryInit();
+        final CronetTestActivity activity = skipFactoryInitInOnCreate();
         final ConditionVariable block = new ConditionVariable(false);
 
         // Post a task to main thread to block until shutdown is called to test
@@ -192,7 +192,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
     @SmallTest
     @Feature({"Cronet"})
     public void testInitAndShutdownOnMainThread() throws Exception {
-        final CronetTestActivity activity = launchCronetTestAppAndSkipFactoryInit();
+        final CronetTestActivity activity = skipFactoryInitInOnCreate();
         final ConditionVariable block = new ConditionVariable(false);
 
         // Post a task to main thread to init and shutdown on the main thread.
@@ -416,15 +416,17 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
 
     private void enableCache(UrlRequestContextConfig.HttpCache cacheType)
             throws Exception {
-        String cacheTypeString = "";
-        if (cacheType == UrlRequestContextConfig.HttpCache.DISK) {
-            cacheTypeString = CronetTestActivity.CACHE_DISK;
-        } else if (cacheType == UrlRequestContextConfig.HttpCache.DISK_NO_HTTP) {
-            cacheTypeString = CronetTestActivity.CACHE_DISK_NO_HTTP;
-        } else if (cacheType == UrlRequestContextConfig.HttpCache.IN_MEMORY) {
-            cacheTypeString = CronetTestActivity.CACHE_IN_MEMORY;
+        UrlRequestContextConfig config = new UrlRequestContextConfig();
+        config.setLibraryName("cronet_tests");
+        if (cacheType == UrlRequestContextConfig.HttpCache.DISK
+                || cacheType == UrlRequestContextConfig.HttpCache.DISK_NO_HTTP) {
+            config.setStoragePath(prepareTestStorage());
         }
-        String[] commandLineArgs = {CronetTestActivity.CACHE_KEY, cacheTypeString};
+
+        config.enableHttpCache(cacheType, 1000 * 1024);
+        String[] commandLineArgs = {
+                CronetTestActivity.CONFIG_KEY, config.toString()
+        };
         mActivity = launchCronetTestAppWithUrlAndCommandLineArgs(null,
                 commandLineArgs);
         assertTrue(NativeTestServer.startNativeTestServer(
@@ -520,27 +522,39 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
                 listener.mError.getMessage());
     }
 
+    // TODO(mef): Simple cache uses global thread pool that is not affected by
+    // shutdown of UrlRequestContext. This test can be flaky unless that thread
+    // pool is shutdown and recreated. Enable the test when crbug.com/442321 is fixed.
     @SmallTest
     @Feature({"Cronet"})
-    public void testEnableHttpCacheDiskNewContext() throws Exception {
-        enableCache(UrlRequestContextConfig.HttpCache.DISK);
+    public void disabled_testEnableHttpCacheDiskNewContext() throws Exception {
+        UrlRequestContextConfig config = new UrlRequestContextConfig();
+        config.setLibraryName("cronet_tests");
+        config.setStoragePath(prepareTestStorage());
+        config.enableHttpCache(UrlRequestContextConfig.HttpCache.DISK, 1000 * 1024);
+        String[] commandLineArgs = {
+                CronetTestActivity.CONFIG_KEY, config.toString()
+        };
+        mActivity = launchCronetTestAppWithUrlAndCommandLineArgs(null,
+                commandLineArgs);
+        assertTrue(NativeTestServer.startNativeTestServer(
+                getInstrumentation().getTargetContext()));
         String url = NativeTestServer.getFileURL("/cacheable.txt");
         checkRequestCaching(url, false);
         checkRequestCaching(url, true);
         NativeTestServer.shutdownNativeTestServer();
         checkRequestCaching(url, true);
-
         // Shutdown original context and create another that uses the same cache.
         mActivity.mUrlRequestContext.shutdown();
-        mActivity.mUrlRequestContext = UrlRequestContext.createContext(
-                getInstrumentation().getTargetContext(), mActivity.getContextConfig());
+        mActivity.mUrlRequestContext = mActivity.mUrlRequestContext.createContext(
+                getInstrumentation().getTargetContext(), config);
         checkRequestCaching(url, true);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testInitContextAndStartRequest() {
-        CronetTestActivity activity = launchCronetTestAppAndSkipFactoryInit();
+        CronetTestActivity activity = skipFactoryInitInOnCreate();
 
         // Immediately make a request after initializing the context.
         UrlRequestContext requestContext = activity.initRequestContext();
@@ -555,7 +569,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
     @SmallTest
     @Feature({"Cronet"})
     public void testInitContextStartTwoRequests() throws Exception {
-        CronetTestActivity activity = launchCronetTestAppAndSkipFactoryInit();
+        CronetTestActivity activity = skipFactoryInitInOnCreate();
 
         // Make two requests after initializing the context.
         UrlRequestContext requestContext = activity.initRequestContext();
@@ -576,7 +590,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
     @SmallTest
     @Feature({"Cronet"})
     public void testInitTwoContextsSimultaneously() throws Exception {
-        final CronetTestActivity activity = launchCronetTestAppAndSkipFactoryInit();
+        final CronetTestActivity activity = skipFactoryInitInOnCreate();
 
         // Threads will block on runBlocker to ensure simultaneous execution.
         ConditionVariable runBlocker = new ConditionVariable(false);
@@ -595,7 +609,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
     @SmallTest
     @Feature({"Cronet"})
     public void testInitTwoContextsInSequence() throws Exception {
-        final CronetTestActivity activity = launchCronetTestAppAndSkipFactoryInit();
+        final CronetTestActivity activity = skipFactoryInitInOnCreate();
 
         ConditionVariable runBlocker = new ConditionVariable(true);
         RequestThread thread1 = new RequestThread(activity, TEST_URL, runBlocker);
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/HttpUrlRequestFactoryTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/HttpUrlRequestFactoryTest.java
index 1512818..ece55ae 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/HttpUrlRequestFactoryTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/HttpUrlRequestFactoryTest.java
@@ -4,12 +4,11 @@
 
 package org.chromium.net;
 
-import android.content.Context;
 import android.test.suitebuilder.annotation.SmallTest;
 
+import org.chromium.base.PathUtils;
 import org.chromium.base.test.util.Feature;
 
-import java.io.File;
 import java.util.HashMap;
 import java.util.regex.Pattern;
 
@@ -156,6 +155,14 @@ public class HttpUrlRequestFactoryTest extends CronetTestBase {
         NativeTestServer.shutdownNativeTestServer();
     }
 
+    /**
+     * Returns the path for the test storage (http cache, QUIC server info).
+     */
+    public String getTestStoragePath() {
+        return PathUtils.getDataDirectory(
+                getInstrumentation().getTargetContext()) + "/test_storage";
+    }
+
     @SmallTest
     @Feature({"Cronet"})
     public void testEnableHttpCache() {
@@ -176,11 +183,7 @@ public class HttpUrlRequestFactoryTest extends CronetTestBase {
             assertEquals("Storage path must be set", e.getMessage());
         }
 
-        // Create a new directory to hold the disk cache data.
-        File dir = getInstrumentation().getTargetContext().getDir(
-                "disk_cache_dir", Context.MODE_PRIVATE);
-        String path = dir.getPath();
-        config.setStoragePath(path);
+        config.setStoragePath(prepareTestStorage());
         config.enableHttpCache(HttpUrlRequestFactoryConfig.HttpCache.DISK, 100);
         config.enableHttpCache(HttpUrlRequestFactoryConfig.HttpCache.DISK_NO_HTTP, 100);
         try {
@@ -189,6 +192,5 @@ public class HttpUrlRequestFactoryTest extends CronetTestBase {
         } catch (IllegalArgumentException e) {
             assertEquals("Storage path must be empty", e.getMessage());
         }
-        dir.delete();
     }
 }
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetBufferedOutputStreamTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetBufferedOutputStreamTest.java
index a9f230b..698be48 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetBufferedOutputStreamTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetBufferedOutputStreamTest.java
@@ -8,7 +8,6 @@ import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.Feature;
 
-import org.chromium.net.CronetTestActivity;
 import org.chromium.net.CronetTestBase;
 import org.chromium.net.NativeTestServer;
 
@@ -30,10 +29,7 @@ public class CronetBufferedOutputStreamTest extends CronetTestBase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        String[] commandLineArgs = {
-                CronetTestActivity.LIBRARY_INIT_KEY, CronetTestActivity.LIBRARY_INIT_WRAPPER,
-        };
-        launchCronetTestAppWithUrlAndCommandLineArgs(null, commandLineArgs);
+        launchCronetTestApp();
         assertTrue(NativeTestServer.startNativeTestServer(
                 getInstrumentation().getTargetContext()));
     }
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java
index 5168a54..be00a66 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java
@@ -7,7 +7,6 @@ package org.chromium.net.urlconnection;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.Feature;
-import org.chromium.net.CronetTestActivity;
 import org.chromium.net.CronetTestBase;
 import org.chromium.net.NativeTestServer;
 
@@ -36,10 +35,7 @@ public class CronetFixedModeOutputStreamTest extends CronetTestBase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        String[] commandLineArgs = {
-                CronetTestActivity.LIBRARY_INIT_KEY, CronetTestActivity.LIBRARY_INIT_WRAPPER,
-        };
-        launchCronetTestAppWithUrlAndCommandLineArgs(null, commandLineArgs);
+        launchCronetTestApp();
         assertTrue(NativeTestServer.startNativeTestServer(
                 getInstrumentation().getTargetContext()));
     }
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTest.java
index 500cc8b..2f181de 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTest.java
@@ -13,6 +13,7 @@ import org.chromium.net.CronetTestActivity;
 import org.chromium.net.CronetTestBase;
 import org.chromium.net.MockUrlRequestJobFactory;
 import org.chromium.net.NativeTestServer;
+import org.chromium.net.UrlRequestContextConfig;
 import org.chromium.net.UrlRequestException;
 
 import java.io.ByteArrayOutputStream;
@@ -44,11 +45,14 @@ public class CronetHttpURLConnectionTest extends CronetTestBase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
+        UrlRequestContextConfig config = new UrlRequestContextConfig();
+        config.setStoragePath(prepareTestStorage());
+        config.enableHttpCache(UrlRequestContextConfig.HttpCache.DISK,
+                1000 * 1024);
         String[] commandLineArgs = {
-                CronetTestActivity.CACHE_KEY, CronetTestActivity.CACHE_DISK,
-                CronetTestActivity.LIBRARY_INIT_KEY, CronetTestActivity.LIBRARY_INIT_WRAPPER,
-        };
-        launchCronetTestAppWithUrlAndCommandLineArgs(null, commandLineArgs);
+                CronetTestActivity.CONFIG_KEY, config.toString()};
+        launchCronetTestAppWithUrlAndCommandLineArgs(null,
+                commandLineArgs);
         assertTrue(NativeTestServer.startNativeTestServer(
                 getInstrumentation().getTargetContext()));
     }
diff --git a/components/cronet/android/test/src/org/chromium/net/CronetTestActivity.java b/components/cronet/android/test/src/org/chromium/net/CronetTestActivity.java
index efe9d53..b614938 100644
--- a/components/cronet/android/test/src/org/chromium/net/CronetTestActivity.java
+++ b/components/cronet/android/test/src/org/chromium/net/CronetTestActivity.java
@@ -10,14 +10,10 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.util.Log;
 
-import static junit.framework.Assert.assertTrue;
-
-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;
@@ -34,32 +30,17 @@ public class CronetTestActivity extends Activity {
     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 LIBRARY_INIT_KEY = "libraryInit";
     /**
-      * Skips library initialization.
+      * Skip library initialization.
       */
     public static final String LIBRARY_INIT_SKIP = "skip";
 
-    // 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";
-
     /**
-      * Initializes Cronet Async API only.
+      * Initialize Cronet Async API only.
       */
     public static final String LIBRARY_INIT_CRONET_ONLY = "cronetOnly";
 
-    /**
-      * Initializes Cronet HttpURLConnection Wrapper API.
-      */
-    public static final String LIBRARY_INIT_WRAPPER = "wrapperOnly";
-
     public CronetURLStreamHandlerFactory mStreamHandlerFactory;
     public UrlRequestContext mUrlRequestContext;
     HttpUrlRequestFactory mRequestFactory;
@@ -90,19 +71,14 @@ public class CronetTestActivity extends Activity {
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        prepareTestStorage();
 
         String initString = getCommandLineArg(LIBRARY_INIT_KEY);
         if (LIBRARY_INIT_SKIP.equals(initString)) {
             return;
         }
 
-        if (LIBRARY_INIT_WRAPPER.equals(initString)) {
-            mStreamHandlerFactory =
-                new CronetURLStreamHandlerFactory(this, getContextConfig());
-        }
-
         mUrlRequestContext = initRequestContext();
+        mStreamHandlerFactory = new CronetURLStreamHandlerFactory(this, getContextConfig());
         mHistogramManager = HistogramManager.createHistogramManager();
 
         if (LIBRARY_INIT_CRONET_ONLY.equals(initString)) {
@@ -116,46 +92,12 @@ public class CronetTestActivity extends Activity {
         }
     }
 
-    /**
-     * Prepares the path for the test storage (http cache, QUIC server info).
-     */
-    private void prepareTestStorage() {
-        File storage = new File(getTestStorage());
-        if (storage.exists()) {
-            assertTrue(recursiveDelete(storage));
-        }
-        assertTrue(storage.mkdir());
-    }
-
-    private String getTestStorage() {
-        return PathUtils.getDataDirectory(getApplicationContext()) + "/test_storage";
-    }
-
-    private boolean recursiveDelete(File path) {
-        if (path.isDirectory()) {
-            for (File c : path.listFiles()) {
-                if (!recursiveDelete(c)) {
-                    return false;
-                }
-            }
-        }
-        return path.delete();
-    }
-
     UrlRequestContextConfig getContextConfig() {
         UrlRequestContextConfig config = new UrlRequestContextConfig();
-
-        String cacheString = getCommandLineArg(CACHE_KEY);
-        if (CACHE_DISK.equals(cacheString)) {
-            config.setStoragePath(getTestStorage());
-            config.enableHttpCache(UrlRequestContextConfig.HttpCache.DISK, 1000 * 1024);
-        } else if (CACHE_DISK_NO_HTTP.equals(cacheString)) {
-            config.setStoragePath(getTestStorage());
-            config.enableHttpCache(UrlRequestContextConfig.HttpCache.DISK_NO_HTTP, 1000 * 1024);
-        } else if (CACHE_IN_MEMORY.equals(cacheString)) {
-            config.enableHttpCache(UrlRequestContextConfig.HttpCache.IN_MEMORY, 100 * 1024);
-        }
-        config.enableSPDY(true).enableQUIC(true);
+        config.enableHttpCache(UrlRequestContextConfig.HttpCache.IN_MEMORY,
+                               100 * 1024)
+              .enableSPDY(true)
+              .enableQUIC(true);
 
         // Override config if it is passed from the launcher.
         String configString = getCommandLineArg(CONFIG_KEY);
@@ -246,24 +188,16 @@ public class CronetTestActivity extends Activity {
     }
 
     public void startNetLog() {
-        if (mRequestFactory != null) {
-            mRequestFactory.startNetLogToFile(Environment.getExternalStorageDirectory().getPath()
-                    + "/cronet_sample_netlog_old_api.json",
-                    false);
-        }
-        if (mUrlRequestContext != null) {
-            mUrlRequestContext.startNetLogToFile(Environment.getExternalStorageDirectory().getPath()
-                    + "/cronet_sample_netlog_new_api.json",
-                    false);
-        }
+        mRequestFactory.startNetLogToFile(Environment.getExternalStorageDirectory().getPath()
+                + "/cronet_sample_netlog_old_api.json",
+                false);
+        mUrlRequestContext.startNetLogToFile(Environment.getExternalStorageDirectory().getPath()
+                + "/cronet_sample_netlog_new_api.json",
+                false);
     }
 
     public void stopNetLog() {
-        if (mRequestFactory != null) {
-            mRequestFactory.stopNetLog();
-        }
-        if (mUrlRequestContext != null) {
-            mUrlRequestContext.stopNetLog();
-        }
+        mRequestFactory.stopNetLog();
+        mUrlRequestContext.stopNetLog();
     }
 }