Add host resolver rules experimental flag for Cronet

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
index c55b9744c7cbba1d14b154a1fa2f61bfa909907b..29cdec0418830a4d5690052c8f6177a153729f67 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
@@ -21,6 +21,7 @@ import org.chromium.base.test.util.Feature;
 import org.chromium.net.CronetEngine.UrlRequestInfo;
 import org.chromium.net.TestUrlRequestCallback.ResponseStep;
 import org.chromium.net.test.EmbeddedTestServer;
+import org.json.JSONObject;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -41,6 +42,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
             "http://mock.failed.request/-2";
     private static final String MOCK_CRONET_TEST_SUCCESS_URL =
             "http://mock.http/success.txt";
+    private static final String RESOLVER_TEST_HOSTNAME = "some-weird-hostname";

[pauljensen, 2016/04/07 16:29:15]

if this is just used for one test, how about we move it into that test.

[mgersh, 2016/06/08 18:31:14]

Done.

 
     private EmbeddedTestServer mTestServer;
     private String mUrl;
@@ -1019,4 +1021,25 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
             assertTrue(loader.wasCalled());
         }
     }
+
+    @SmallTest
+    @Feature({"Cronet"})
+    public void testHostResolverRules() throws Exception {
+        CronetEngine.Builder cronetEngineBuilder = new CronetEngine.Builder(getContext());
+        JSONObject hostResolverRules = new JSONObject().put(
+                "host_resolver_rules", "MAP " + RESOLVER_TEST_HOSTNAME + " 127.0.0.1:8000");

[pauljensen, 2016/04/07 16:29:15]

I think port 8000 is the python test server running on the host, which we're
trying to avoid, can this instead use mUrl which points at the
EmbeddedTestServer?

[mgersh, 2016/06/08 18:31:13]

Done, with some fiddling to get the right parts of mUrl in the right places.

+        JSONObject experimentalOptions =
+                new JSONObject().put("HostResolverRules", hostResolverRules);
+        cronetEngineBuilder.setExperimentalOptions(experimentalOptions.toString());
+
+        mTestFramework =
+                startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, cronetEngineBuilder);
+        TestUrlRequestCallback callback = new TestUrlRequestCallback();
+        UrlRequest.Builder urlRequestBuilder =
+                new UrlRequest.Builder("http://" + RESOLVER_TEST_HOSTNAME, callback,

[pauljensen, 2016/04/07 16:29:15]

can this also use mUrl?

[mgersh, 2016/06/08 18:31:14]

Done.

+                        callback.getExecutor(), mTestFramework.mCronetEngine);
+        urlRequestBuilder.build().start();
+        callback.blockForDone();
+        assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
+    }
 }