Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / cronet / android / test / src / org / chromium / cronet_test_apk / CronetTestActivity.java

diff --git a/src/components/cronet/android/test/src/org/chromium/cronet_test_apk/CronetTestActivity.java b/src/components/cronet/android/test/src/org/chromium/cronet_test_apk/CronetTestActivity.java
index ea83ef8..bcaaa87 100644 (file)
--- a/src/components/cronet/android/test/src/org/chromium/cronet_test_apk/CronetTestActivity.java
+++ b/src/components/cronet/android/test/src/org/chromium/cronet_test_apk/CronetTestActivity.java
@@ -12,11 +12,11 @@ import android.os.Environment;
 import android.util.Log;
 
 import org.chromium.base.PathUtils;
-import org.chromium.net.ChromiumUrlRequestFactory;
 import org.chromium.net.HttpUrlRequest;
 import org.chromium.net.HttpUrlRequestFactory;
 import org.chromium.net.HttpUrlRequestFactoryConfig;
 import org.chromium.net.HttpUrlRequestListener;
+import org.chromium.net.UrlRequestContext;
 
 import java.io.ByteArrayInputStream;
 import java.io.FileOutputStream;
@@ -36,9 +36,10 @@ 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 SKIP_FACTORY_INIT_KEY = "skipFactoryInit";
 
-    ChromiumUrlRequestFactory mChromiumRequestFactory;
     HttpUrlRequestFactory mRequestFactory;
+    UrlRequestContext mUrlRequestContext;
 
     String mUrl;
 
@@ -78,6 +79,23 @@ public class CronetTestActivity extends Activity {
             return;
         }
 
+        String skipInitString = getCommandLineArg(SKIP_FACTORY_INIT_KEY);
+        if (skipInitString != null) {
+            return;
+        }
+        mRequestFactory = initRequestFactory();
+        if (mRequestFactory == null) {
+            return;
+        }
+
+        String appUrl = getUrlFromIntent(getIntent());
+        if (appUrl != null) {
+            startWithURL(appUrl);
+        }
+    }
+
+    // Helper function to initialize request factory. Also used in testing.
+    public HttpUrlRequestFactory initRequestFactory() {
         HttpUrlRequestFactoryConfig config = new HttpUrlRequestFactoryConfig();
         config.enableHttpCache(HttpUrlRequestFactoryConfig.HttpCache.IN_MEMORY,
                                100 * 1024)
@@ -93,23 +111,18 @@ public class CronetTestActivity extends Activity {
             } catch (org.json.JSONException e) {
                 Log.e(TAG, "Invalid Config.", e);
                 finish();
-                return;
+                return null;
             }
         }
 
         // Setting this here so it isn't overridden on the command line
         config.setLibraryName("cronet_tests");
 
-        mRequestFactory = HttpUrlRequestFactory.createFactory(
-                getApplicationContext(), config);
-
-        mChromiumRequestFactory = new ChromiumUrlRequestFactory(
+        mUrlRequestContext = UrlRequestContext.createContext(
                 getApplicationContext(), config);
 
-        String appUrl = getUrlFromIntent(getIntent());
-        if (appUrl != null) {
-            startWithURL(appUrl);
-        }
+        return HttpUrlRequestFactory.createFactory(getApplicationContext(),
+                                                   config);
     }
 
     private boolean loadTestFiles() {
@@ -144,7 +157,7 @@ public class CronetTestActivity extends Activity {
             byte[] buffer = new byte[1024];
             int read;
             while ((read = in.read(buffer)) != -1) {
-              out.write(buffer, 0, read);
+                out.write(buffer, 0, read);
             }
             in.close();
             out.flush();
@@ -217,12 +230,12 @@ public class CronetTestActivity extends Activity {
     }
 
     public void startNetLog() {
-        mChromiumRequestFactory.getRequestContext().startNetLogToFile(
-                Environment.getExternalStorageDirectory().getPath() +
-                        "/cronet_sample_netlog.json");
+        mRequestFactory.startNetLogToFile(
+                Environment.getExternalStorageDirectory().getPath()
+                        + "/cronet_sample_netlog.json");
     }
 
     public void stopNetLog() {
-        mChromiumRequestFactory.getRequestContext().stopNetLog();
+        mRequestFactory.stopNetLog();
     }
 }