[Cronet] Add support to run quic_simple_server

components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlTest.java

Index: components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlTest.java
index 481cebad8cc2df09f5a9c25b6b8cf60c5010c74d..d940dea2f810dea6a4e6ea962a7ff7a8264a77ce 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlTest.java
@@ -134,13 +134,12 @@ public class CronetUrlTest extends CronetTestBase {
 
     @SmallTest
     @Feature({"Cronet"})
-    public void disabled_testQuicLoadUrl() throws Exception {
+    public void testQuicLoadUrl() throws Exception {
         HttpUrlRequestFactoryConfig config = new HttpUrlRequestFactoryConfig();
-        // TODO(mef): Test Quic end-to-end using local QUIC server.
-        String quicURL = "https://www.google.com:443";
-        String quicNegotiatedProtocol = "quic/1+spdy/3";
+        String quicURL = QuicTestServer.SERVER_URL + "/simple.txt";
         config.enableQUIC(true);
-        config.addQuicHint("www.google.com", 443, 443);
+        config.setLibraryName("cronet_tests");
+        config.addQuicHint("127.0.0.1", 6121, 6121);

[mef, 2015/03/31 17:33:18]

should those constants come from QuicTestServer?

[xunjieli, 2015/03/31 17:50:15]

Done.

         config.setExperimentalQuicConnectionOptions("PACE,IW10,FOO,DEADBEEF");
 
         String[] commandLineArgs = {
@@ -148,32 +147,26 @@ public class CronetUrlTest extends CronetTestBase {
         CronetTestActivity activity =
                 launchCronetTestAppWithUrlAndCommandLineArgs(null,
                                                              commandLineArgs);
+        QuicTestServer.startQuicTestServer(activity.getApplicationContext());
         activity.startNetLog();
 
         HashMap<String, String> headers = new HashMap<String, String>();
         TestHttpUrlRequestListener listener = new TestHttpUrlRequestListener();
 
-        // Try several times as first request may not use QUIC.
-        // TODO(mef): Remove loop after adding http server properties manager.
-        for (int i = 0; i < 10; ++i) {
-            HttpUrlRequest request =
-                    activity.mRequestFactory.createRequest(
-                            quicURL,
-                            HttpUrlRequest.REQUEST_PRIORITY_MEDIUM,
-                            headers,
-                            listener);
-            request.start();
-            listener.blockForComplete();
-            assertEquals(200, listener.mHttpStatusCode);
-            if (listener.mNegotiatedProtocol.equals(quicNegotiatedProtocol)) {
-                break;
-            }
-            Thread.sleep(1000);
-            listener.resetComplete();
-        }
-
-        assertEquals(quicNegotiatedProtocol, listener.mNegotiatedProtocol);
+        HttpUrlRequest request =
+                activity.mRequestFactory.createRequest(
+                        quicURL,
+                        HttpUrlRequest.REQUEST_PRIORITY_MEDIUM,
+                        headers,
+                        listener);
+        request.start();
+        listener.blockForComplete();
+        assertEquals(200, listener.mHttpStatusCode);
+        assertEquals(
+                "This is a simple text file served by QUIC.\n", listener.mResponseAsString);
+        assertEquals("quic/1+spdy/3", listener.mNegotiatedProtocol);
         activity.stopNetLog();
+        QuicTestServer.shutdownQuicTestServer();
     }
 
     @SmallTest