[Cronet] Unit test refactoring and fixes

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 a1a759a19fa8583a1dec1521148c395706f0a1c2..3c625a746a279728a8a3e3be82a228a3087e16c4 100644
--- a/components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java
+++ b/components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java
@@ -105,7 +105,6 @@ public class 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) {
@@ -149,12 +148,12 @@ public class CronetTestFramework {
     /**
      * Prepares the path for the test storage (http cache, QUIC server info).
      */
-    private void prepareTestStorage() {
-        File storage = new File(getTestStorageDirectory(mContext));
+    public static void prepareTestStorage(Context context) {

[xunjieli, 2015/12/07 23:09:10]

I think moving CronetTestFramework into CronetTestBase.java might be another
cleanup that might worth considering.

That way we can consolidate some of the setup/initialization logic, and some of
the member variables. 

[kapishnikov, 2015/12/08 01:09:37]

Yes, I agree that we could move some of the CronetTestFramework logic into the
CronetTestBase class and the remaining parts to some utility class/classes. Lets
do the refactoring in a new CL since this one already addresses couple of
issues.

+        File storage = new File(getTestStorageDirectory(context));
         if (storage.exists()) {
             assertTrue(recursiveDelete(storage));
         }
-        ensureTestStorageExists(mContext);
+        ensureTestStorageExists(context);
     }
 
     /**
@@ -185,7 +184,7 @@ public class CronetTestFramework {
     }
 
     @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
-    private boolean recursiveDelete(File path) {
+    private static boolean recursiveDelete(File path) {
         if (path.isDirectory()) {
             for (File c : path.listFiles()) {
                 if (!recursiveDelete(c)) {