Add Cronet Test App that uses libcronet_tests.so with net test utilities.

components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/HttpUrlRequestFactoryTest.java

Index: components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/HttpUrlRequestFactoryTest.java
diff --git a/components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/HttpUrlRequestFactoryTest.java b/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/HttpUrlRequestFactoryTest.java
similarity index 67%
rename from components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/HttpUrlRequestFactoryTest.java
rename to components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/HttpUrlRequestFactoryTest.java
index e37b2d23a014af00a3126a12e305fa09fe1a298a..b5a7969d6b015ef4b1dbb04b3b09762d12ac377c 100644
--- a/components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/HttpUrlRequestFactoryTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/HttpUrlRequestFactoryTest.java
@@ -2,9 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.cronet_sample_apk;
+package org.chromium.cronet_test_apk;
 
-import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.Feature;
@@ -16,13 +15,24 @@ import java.util.regex.Pattern;
 /**
  * Tests for {@link HttpUrlRequestFactory}
  */
-public class HttpUrlRequestFactoryTest extends InstrumentationTestCase {
+public class HttpUrlRequestFactoryTest extends CronetTestBase {
+    // URL used for base tests.
+    private static final String URL = "http://127.0.0.1:8000";
+
     @SmallTest
     @Feature({"Cronet"})
-    public void testCreateFactory() {
+    public void testCreateFactory() throws Throwable {
         HttpUrlRequestFactoryConfig config = new HttpUrlRequestFactoryConfig();
-        HttpUrlRequestFactory factory = HttpUrlRequestFactory.createFactory(
-                getInstrumentation().getContext(), config);
+        String[] commandLineArgs = {
+                CronetTestActivity.CONFIG_KEY, config.toString() };
+        CronetTestActivity activity =
+                launchCronetTestAppWithUrlAndCommandLineArgs(URL,
+                                                            commandLineArgs);

[mmenke, 2014/09/11 21:10:16]

Fix indent.

[mef, 2014/09/11 22:03:25]

Done.

+        // Make sure the activity was created as expected.
+        assertNotNull(activity);
+        waitForActiveShellToBeDoneLoading();
+
+        HttpUrlRequestFactory factory = activity.mRequestFactory;
         assertNotNull("Factory should be created", factory);
         assertTrue("Factory should be Chromium/n.n.n.n@r but is " +
                            factory.getName(),