Fix Cronet compilation and test errors.

components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleUrlTest.java

Index: components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleUrlTest.java
diff --git a/components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleUrlTest.java b/components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleUrlTest.java
index 3136ca72646bb5166fffd8fa848333b9178bf925..4da0b8012ad086c914c8e64d18c43b9a40a36913 100644
--- a/components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleUrlTest.java
+++ b/components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleUrlTest.java
@@ -23,6 +23,27 @@ public class CronetSampleUrlTest extends CronetSampleTestBase {
     // URL used for base tests.
     private static final String URL = "http://127.0.0.1:8000";
 
+    class TestHttpUrlRequestListener implements HttpUrlRequestListener {

[mmenke, 2014/08/25 19:46:44]

While this is much better than before, and certainly worth doing, does this
belong with the other changes?  Did something break here, too?

[mef, 2014/08/25 20:26:18]

Not really. Should I split them out?

[mmenke, 2014/08/25 20:36:43]

Please do, thanks!

[mef, 2014/08/25 22:12:42]

Done.

+        ConditionVariable mComplete = new ConditionVariable();
+
+        public TestHttpUrlRequestListener() {
+        }
+
+        @Override
+        public void onResponseStarted(HttpUrlRequest request) {
+            assertNotNull(request.getAllHeaders());
+        }
+
+        @Override
+        public void onRequestComplete(HttpUrlRequest request) {
+            mComplete.open();
+        }
+
+        public void blockForComplete() {
+            mComplete.block();
+        }
+    }
+
     @SmallTest
     @Feature({"Cronet"})
     public void testLoadUrl() throws Exception {
@@ -75,8 +96,7 @@ public class CronetSampleUrlTest extends CronetSampleTestBase {
     @SmallTest
     @Feature({"Cronet"})
     public void testNetLog() throws Exception {
-        CronetSampleActivity activity = launchCronetSampleWithUrl(
-                "127.0.0.1:8000");
+        CronetSampleActivity activity = launchCronetSampleWithUrl(URL);
 
         // Make sure the activity was created as expected.
         assertNotNull(activity);
@@ -85,8 +105,15 @@ public class CronetSampleUrlTest extends CronetSampleTestBase {
         File file = File.createTempFile("cronet", "json");
         activity.mChromiumRequestFactory.getRequestContext().startNetLogToFile(
                 file.getPath());
-        activity.startWithURL(URL);
-        Thread.sleep(5000);
+
+        HashMap<String, String> headers = new HashMap<String, String>();
+        TestHttpUrlRequestListener listener = new TestHttpUrlRequestListener();
+
+        HttpUrlRequest request = activity.mChromiumRequestFactory.createRequest(
+                URL, HttpUrlRequest.REQUEST_PRIORITY_MEDIUM, headers, listener);
+        request.start();
+        listener.blockForComplete();
+
         activity.mChromiumRequestFactory.getRequestContext().stopNetLog();
         assertTrue(file.exists());
         assertTrue(file.length() != 0);
@@ -94,9 +121,8 @@ public class CronetSampleUrlTest extends CronetSampleTestBase {
         assertTrue(!file.exists());
     }
 
-    class BadHttpUrlRequestListener implements HttpUrlRequestListener {
+    class BadHttpUrlRequestListener extends TestHttpUrlRequestListener {
         static final String THROW_TAG = "BadListener";
-        ConditionVariable mComplete = new ConditionVariable();
 
         public BadHttpUrlRequestListener() {
         }
@@ -105,16 +131,6 @@ public class CronetSampleUrlTest extends CronetSampleTestBase {
         public void onResponseStarted(HttpUrlRequest request) {
             throw new NullPointerException(THROW_TAG);
         }
-
-        @Override
-        public void onRequestComplete(HttpUrlRequest request) {
-            mComplete.open();
-            throw new NullPointerException(THROW_TAG);
-        }
-
-        public void blockForComplete() {
-            mComplete.block();
-        }
     }
 
     @SmallTest
@@ -130,14 +146,15 @@ public class CronetSampleUrlTest extends CronetSampleTestBase {
         HashMap<String, String> headers = new HashMap<String, String>();
         BadHttpUrlRequestListener listener = new BadHttpUrlRequestListener();
 
-        // Create request with null listener to trigger an exception.
+        // Create request with bad listener to trigger an exception.
         HttpUrlRequest request = activity.mChromiumRequestFactory.createRequest(
                 URL, HttpUrlRequest.REQUEST_PRIORITY_MEDIUM, headers, listener);
         request.start();
         listener.blockForComplete();
         assertTrue(request.isCanceled());
         assertNotNull(request.getException());
-        assertEquals(listener.THROW_TAG, request.getException().getCause().getMessage());
+        assertEquals(listener.THROW_TAG,
+                     request.getException().getCause().getMessage());
 
     }