[Cronet] Allow UrlRequest bypass cache

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

Index: components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CronetUrlRequestContextTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CronetUrlRequestContextTest.java b/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CronetUrlRequestContextTest.java
index 9908acec0b3619f70f0a93570bbc09f4ebddbcf4..31372ba4dbb254f33a6a4d6ef89a3d7245be9537 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CronetUrlRequestContextTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CronetUrlRequestContextTest.java
@@ -297,9 +297,17 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
     }
 
     private void checkRequestCaching(String url, boolean expectCached) {
+        checkRequestCaching(url, expectCached, false);
+    }
+
+    private void checkRequestCaching(String url, boolean expectCached,
+            boolean bypassCache) {
         TestUrlRequestListener listener = new TestUrlRequestListener();
         UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
                 url, listener, listener.getExecutor());
+        if (bypassCache) {
+            urlRequest.bypassCache();
+        }
         urlRequest.start();
         listener.blockForDone();
         assertEquals(expectCached, listener.mResponseInfo.wasCached());
@@ -348,6 +356,20 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
         checkRequestCaching(url, false);
     }
 
+    @SmallTest
+    @Feature({"Cronet"})
+    public void testBypassCache() throws Exception {
+        enableCache(UrlRequestContextConfig.HttpCache.DISK);
+        String url = UploadTestServer.getFileURL("/cacheable.txt");

[mmenke, 2015/01/22 21:18:39]

Should have a "checkRequestCaching(url, false, true /** bypass cache */);" here,
to make sure it doesn't write to the cache, in addition to not reading from it.

[xunjieli, 2015/01/26 21:36:09]

Done.

+        checkRequestCaching(url, false);
+        // Check bypassing cache works.
+        checkRequestCaching(url, false, true /** bypass cache */);
+        // Check if bypass is not enabled, request is cached.
+        checkRequestCaching(url, true);
+        UploadTestServer.shutdownUploadTestServer();
+        checkRequestCaching(url, true);

[mmenke, 2015/01/22 16:21:20]

Suggest doing the equivalent of checkRequestCaching(url, false, true), and
making sure we get an error.

[xunjieli, 2015/01/26 21:36:09]

Done.

+    }
+
     // TODO(mef): Simple cache uses global thread pool that is not affected by
     // shutdown of UrlRequestContext. This test can be flaky unless that thread
     // pool is destroyed and recreated. Enable the test when crbug.com/442321 is fixed.