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

components/cronet/android/test/src/org/chromium/cronet_test_apk/CronetTestActivity.java

Index: components/cronet/android/test/src/org/chromium/cronet_test_apk/CronetTestActivity.java
diff --git a/components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java b/components/cronet/android/test/src/org/chromium/cronet_test_apk/CronetTestActivity.java
similarity index 67%
copy from components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
copy to components/cronet/android/test/src/org/chromium/cronet_test_apk/CronetTestActivity.java
index 84ee97e2fdbe6edcbcf5935aeb2878c13c24797b..bf0cbc787e9aedcb1b1b6be5017c961db75ec5ec 100644
--- a/components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
+++ b/components/cronet/android/test/src/org/chromium/cronet_test_apk/CronetTestActivity.java
@@ -2,24 +2,19 @@
 // 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.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Environment;
 import android.util.Log;
-import android.widget.EditText;
-import android.widget.Toast;
 
 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.LibraryLoader;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -29,16 +24,16 @@ import java.nio.channels.ReadableByteChannel;
 import java.util.HashMap;
 
 /**
- * Activity for managing the Cronet Sample.
+ * Activity for managing the Cronet Test.
  */
-public class CronetSampleActivity extends Activity {
-    private static final String TAG = "CronetSampleActivity";
+public class CronetTestActivity extends Activity {
+    private static final String TAG = "CronetTestActivity";
 
     public static final String COMMAND_LINE_ARGS_KEY = "commandLineArgs";
-
     public static final String POST_DATA_KEY = "postData";
     public static final String CONFIG_KEY = "config";
 
+

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

nit:  Remove blank line.

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

Done.

     ChromiumUrlRequestFactory mChromiumRequestFactory;
     HttpUrlRequestFactory mRequestFactory;
 
@@ -48,37 +43,18 @@ public class CronetSampleActivity extends Activity {
 
     int mHttpStatusCode = 0;
 
-    class SampleHttpUrlRequestListener implements HttpUrlRequestListener {
-        public SampleHttpUrlRequestListener() {
+    class TestHttpUrlRequestListener implements HttpUrlRequestListener {
+        public TestHttpUrlRequestListener() {
         }
 
         @Override
         public void onResponseStarted(HttpUrlRequest request) {
-            Log.i(TAG, "****** Response Started, content length is "
-                    + request.getContentLength());
-            Log.i(TAG, "*** Headers Are *** " + request.getAllHeaders());
+            mHttpStatusCode = request.getHttpStatusCode();
         }
 
         @Override
         public void onRequestComplete(HttpUrlRequest request) {
-            Log.i(TAG, "****** Request Complete, status code is "
-                    + getHttpStatusCode());
-            Intent intent = new Intent(getApplicationContext(),
-                    CronetSampleActivity.class);
-            startActivity(intent);
-            final String url = request.getUrl();
-            final CharSequence text = "Completed " + request.getUrl() + " ("
-                    + request.getHttpStatusCode() + ")";
-            mHttpStatusCode = request.getHttpStatusCode();
-            CronetSampleActivity.this.runOnUiThread(new Runnable() {
-                public void run() {
-                    mLoading = false;
-                    Toast toast = Toast.makeText(getApplicationContext(), text,
-                            Toast.LENGTH_SHORT);
-                    toast.show();
-                    promptForURL(url);
-                }
-            });
+            mLoading = false;
         }
     }
 
@@ -87,9 +63,9 @@ public class CronetSampleActivity extends Activity {
         super.onCreate(savedInstanceState);
 
         try {
-            LibraryLoader.ensureInitialized();
+            System.loadLibrary("cronet_tests");
         } catch (UnsatisfiedLinkError e) {
-            Log.e(TAG, "libcronet_sample initialization failed.", e);
+            Log.e(TAG, "libcronet_test initialization failed.", e);
             finish();
             return;
         }
@@ -120,30 +96,11 @@ public class CronetSampleActivity extends Activity {
                 getApplicationContext(), config);
 
         String appUrl = getUrlFromIntent(getIntent());
-        if (appUrl == null) {
-            promptForURL("https://");
-        } else {
+        if (appUrl != null) {
             startWithURL(appUrl);
         }
     }
 
-    private void promptForURL(String url) {
-        Log.i(TAG, "No URL provided via intent, prompting user...");
-        AlertDialog.Builder alert = new AlertDialog.Builder(this);
-        alert.setTitle("Enter a URL");
-        alert.setMessage("Enter a URL");
-        final EditText input = new EditText(this);
-        input.setText(url);
-        alert.setView(input);
-        alert.setPositiveButton("Load", new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int button) {
-                String url = input.getText().toString();
-                startWithURL(url);
-            }
-        });
-        alert.show();
-    }
-
     private static String getUrlFromIntent(Intent intent) {
         return intent != null ? intent.getDataString() : null;
     }
@@ -185,7 +142,7 @@ public class CronetSampleActivity extends Activity {
         mLoading = true;
 
         HashMap<String, String> headers = new HashMap<String, String>();
-        HttpUrlRequestListener listener = new SampleHttpUrlRequestListener();
+        HttpUrlRequestListener listener = new TestHttpUrlRequestListener();
         HttpUrlRequest request = mRequestFactory.createRequest(
                 url, HttpUrlRequest.REQUEST_PRIORITY_MEDIUM, headers, listener);
         applyCommandLineToHttpUrlRequest(request);
@@ -213,4 +170,5 @@ public class CronetSampleActivity extends Activity {
     public void stopNetLog() {
         mChromiumRequestFactory.getRequestContext().stopNetLog();
     }
+

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

nit:  Remove blank line.

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

Done.

 }