Defaulting all downloads to go through Chrome network stack

chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadTest.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.download;
 
 import android.os.Environment;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.View;
 
@@ skipping 27 matching lines @@
             "plain text response from a POST";
 
     private EmbeddedTestServer mTestServer;
 
     private static final String TEST_DOWNLOAD_DIRECTORY = "/chrome/test/data/android/download/";
 
     private static final String FILENAME_WALLPAPER = "[large]wallpaper.dm";
     private static final String FILENAME_TEXT = "superbo.txt";
     private static final String FILENAME_TEXT_1 = "superbo (1).txt";
     private static final String FILENAME_TEXT_2 = "superbo (2).txt";
-    private static final String FILENAME_APK = "test.apk";
+    private static final String FILENAME_SWF = "test.swf";
     private static final String FILENAME_GZIP = "test.gzip";
 
     private static final String[] TEST_FILES = new String[] {
-        FILENAME_WALLPAPER, FILENAME_TEXT, FILENAME_TEXT_1, FILENAME_TEXT_2, FILENAME_APK,
+        FILENAME_WALLPAPER, FILENAME_TEXT, FILENAME_TEXT_1, FILENAME_TEXT_2, FILENAME_SWF,
         FILENAME_GZIP
     };
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         deleteTestFiles();
         mTestServer = EmbeddedTestServer.createAndStartFileServer(
                 getInstrumentation().getContext(), Environment.getExternalStorageDirectory());
     }
@@ skipping 11 matching lines @@
     }
 
     @MediumTest
     @Feature({"Downloads"})
     @RetryOnFailure
     public void testHttpGetDownload() throws Exception {
         loadUrl(mTestServer.getURL(TEST_DOWNLOAD_DIRECTORY + "get.html"));
         waitForFocus();
         View currentView = getActivity().getActivityTab().getView();
 
-        EnqueueHttpGetDownloadCallbackHelper callbackHelper = getHttpGetDownloadCallbackHelper();
-        int callCount = callbackHelper.getCallCount();
+        int callCount = getChromeDownloadCallCount();
         singleClickView(currentView);
-        callbackHelper.waitForCallback(callCount);
-
-        assertEquals(mTestServer.getURL(TEST_DOWNLOAD_DIRECTORY + FILENAME_GZIP),
-                callbackHelper.getDownloadInfo().getUrl());
+        assertTrue(waitForChromeDownloadToFinish(callCount));
+        assertTrue(hasDownload(FILENAME_GZIP, null));
     }
 
     @MediumTest
     @Feature({"Downloads"})
     @RetryOnFailure
     public void testDangerousDownload() throws Exception {
         loadUrl(mTestServer.getURL(TEST_DOWNLOAD_DIRECTORY + "dangerous.html"));
         waitForFocus();
         View currentView = getActivity().getActivityTab().getView();
         singleClickView(currentView);
         assertPollForInfoBarSize(1);
-
-        EnqueueHttpGetDownloadCallbackHelper callbackHelper = getHttpGetDownloadCallbackHelper();
-        int callCount = callbackHelper.getCallCount();
         assertTrue("OK button wasn't found", InfoBarUtil.clickPrimaryButton(getInfoBars().get(0)));
-        callbackHelper.waitForCallback(callCount);
-        assertEquals(mTestServer.getURL(TEST_DOWNLOAD_DIRECTORY + FILENAME_APK),
-                callbackHelper.getDownloadInfo().getUrl());
+        int callCount = getChromeDownloadCallCount();
+        assertTrue(waitForChromeDownloadToFinish(callCount));
+        assertTrue(hasDownload(FILENAME_SWF, null));
     }
 
     @MediumTest
     @Feature({"Downloads"})
     @RetryOnFailure
     public void testDangerousDownloadCancel() throws Exception {
         loadUrl(mTestServer.getURL(TEST_DOWNLOAD_DIRECTORY + "dangerous.html"));
         waitForFocus();
         View currentView = getActivity().getActivityTab().getView();
         TouchCommon.longPressView(currentView);
@@ skipping 36 matching lines @@
     @MediumTest
     @Feature({"Downloads"})
     @DisabledTest(message = "crbug.com/286315")
     public void testCloseEmptyDownloadTab() throws Exception {
         loadUrl(mTestServer.getURL(TEST_DOWNLOAD_DIRECTORY + "get.html"));
         waitForFocus();
         final int initialTabCount = getActivity().getCurrentTabModel().getCount();
         View currentView = getActivity().getActivityTab().getView();
         TouchCommon.longPressView(currentView);
 
-        EnqueueHttpGetDownloadCallbackHelper callbackHelper = getHttpGetDownloadCallbackHelper();
-        int callCount = callbackHelper.getCallCount();
+        int callCount = getChromeDownloadCallCount();
         getInstrumentation().invokeContextMenuAction(getActivity(),
                 R.id.contextmenu_open_in_new_tab, 0);
-        callbackHelper.waitForCallback(callCount);
-        assertEquals(mTestServer.getURL(TEST_DOWNLOAD_DIRECTORY + FILENAME_GZIP),
-                callbackHelper.getDownloadInfo().getUrl());
+        assertTrue(waitForChromeDownloadToFinish(callCount));
+        assertTrue(hasDownload(FILENAME_GZIP, null));
 
         CriteriaHelper.pollUiThread(
                 Criteria.equals(initialTabCount, new Callable<Integer>() {
                     @Override
                     public Integer call() {
                         return getActivity().getCurrentTabModel().getCount();
                     }
                 }));
     }
 
@@ skipping 224 matching lines @@
     }
 
     @MediumTest
     @Feature({"Downloads"})
     @RetryOnFailure
     public void testUrlEscaping() throws Exception {
         loadUrl(mTestServer.getURL(TEST_DOWNLOAD_DIRECTORY + "urlescaping.html"));
         waitForFocus();
         View currentView = getActivity().getActivityTab().getView();
 
-        EnqueueHttpGetDownloadCallbackHelper callbackHelper = getHttpGetDownloadCallbackHelper();
-        int callCount = callbackHelper.getCallCount();
+        int callCount = getChromeDownloadCallCount();
         singleClickView(currentView);
-        callbackHelper.waitForCallback(callCount);
-        assertEquals(mTestServer.getURL(TEST_DOWNLOAD_DIRECTORY + FILENAME_WALLPAPER),
-                callbackHelper.getDownloadInfo().getUrl());
+        assertTrue(waitForChromeDownloadToFinish(callCount));
+        assertTrue(hasDownload(FILENAME_WALLPAPER, null));
     }
 
     private void waitForFocus() {
         View currentView = getActivity().getActivityTab().getView();
         if (!currentView.hasFocus()) {
             singleClickView(currentView);
         }
         getInstrumentation().waitForIdleSync();
     }
 
@@ skipping 15 matching lines @@
     }
 
     /**
      * Makes sure there are no files with names identical to the ones this test uses in the
      * downloads directory
      */
     private void deleteTestFiles() {
         deleteFilesInDownloadDirectory(TEST_FILES);
     }
 }