Add Data Saver support to 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 66c32c0523c804103399c785f4a671f74ed6d455..c86f672515affe42c2ff05c5499d8e71609500ba 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
@@ -103,6 +103,45 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
 
     @SmallTest
     @Feature({"Cronet"})
+    public void testDataReductionProxyEnabled() throws Exception {
+        UrlRequestContextConfig config = new UrlRequestContextConfig();
+        config.setLibraryName("cronet_tests");
+        String[] commandLineArgs = {
+                CronetTestActivity.CONFIG_KEY, config.toString()
+        };
+        mActivity = launchCronetTestAppWithUrlAndCommandLineArgs(null,
+                commandLineArgs);

[mmenke, 2015/05/07 20:22:18]

Can you just do something like:

// Ensure native code is loaded before trying to start test server.
UrlRequestContext.createContext(this, config).shutdown();

Even if that doesn't work for some reason, think it's worth a comment what's
going on.

[bengr, 2015/05/08 22:41:02]

Done.

+        assertTrue(NativeTestServer.startNativeTestServer(
+                getInstrumentation().getTargetContext()));
+
+        String serverHostPort = NativeTestServer.getHostPort();
+        // Shutdown the original context and create a new context that uses the
+        // NativeTestServer as the data reduction proxy.
+        mActivity.mUrlRequestContext.shutdown();
+        UrlRequestContextConfig config2 = new UrlRequestContextConfig();
+        config2.enableDataReductionProxy("test-key");
+        config2.setDataReductionProxyOptions(
+                serverHostPort, "unused.net:9999",
+                NativeTestServer.getFileURL("/secureproxychecksuccess.txt"));
+        config2.setLibraryName("cronet_tests");
+        mActivity.mUrlRequestContext =
+                mActivity.mUrlRequestContext.createContext(
+                        getInstrumentation().getTargetContext(), config2);
+        TestUrlRequestListener listener = new TestUrlRequestListener();
+        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+                "http://google.com/datareductionproxysuccess.txt",
+                listener, listener.getExecutor());
+
+        urlRequest.start();
+        listener.blockForDone();
+        assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
+        assertEquals(serverHostPort, listener.mResponseInfo.getProxyServer());
+        assertEquals("http://www.google.com/datareductionproxysuccess.txt",
+                listener.mResponseInfo.getUrl());

[mmenke, 2015/05/07 20:22:18]

Also think it's worth an explanation of just what this test is really doing.

[bengr, 2015/05/08 22:41:02]

Done.

+    }
+
+    @SmallTest
+    @Feature({"Cronet"})
     public void testShutdown() throws Exception {
         mActivity = launchCronetTestApp();
         TestUrlRequestListener listener = new ShutdownTestUrlRequestListener();