Defaulting all downloads to go through Chrome network stack

chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadTestBase.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.app.DownloadManager;
 import android.content.Context;
 import android.database.Cursor;
 import android.os.Environment;
@@ skipping 81 matching lines @@
 
     /**
      * Check the last download matches the given name and exists in DownloadManager.
      */
     public void checkLastDownload(String fileName) throws IOException {
         String lastDownload = getLastDownloadFile();
         assertTrue(isSameDownloadFile(fileName, lastDownload));
         assertTrue(hasDownload(lastDownload, null));
     }
 
-    public EnqueueHttpGetDownloadCallbackHelper getHttpGetDownloadCallbackHelper() {
-        return mEnqueueHttpGetDownloadCallbackHelper;
-    }
-
     /**
      * Delete all download entries in DownloadManager and delete the corresponding files.
      */
     @SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_BAD_PRACTICE")
     private void cleanUpAllDownloads() {
         DownloadManager manager =
                 (DownloadManager) getActivity().getSystemService(Context.DOWNLOAD_SERVICE);
         Cursor cursor = manager.query(new DownloadManager.Query());
         int idColumnIndex = cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_ID);
         cursor.moveToFirst();
@@ skipping 33 matching lines @@
             cursor = manager.query(query);
             if (!cursor.moveToFirst()) {
                 return null;
             }
             return getPathFromCursor(cursor);
         } finally {
             if (cursor != null) cursor.close();
         }
     }
 
-    protected static class EnqueueHttpGetDownloadCallbackHelper extends CallbackHelper {
-        private DownloadInfo mDownloadInfo;
-
-        public void notifyCalled(DownloadInfo downloadInfo, boolean notifyCompleted) {
-            mDownloadInfo = downloadInfo;
-            super.notifyCalled();
-        }
-
-        public DownloadInfo getDownloadInfo() {
-            return mDownloadInfo;
-        }
-    }
-
-    private final EnqueueHttpGetDownloadCallbackHelper mEnqueueHttpGetDownloadCallbackHelper =
-            new EnqueueHttpGetDownloadCallbackHelper();
     private String mLastDownloadFilePath;
     private final CallbackHelper mHttpDownloadFinished = new CallbackHelper();
     private DownloadManagerService mSavedDownloadManagerService;
 
     protected String getLastDownloadFile() {
         return new File(mLastDownloadFilePath).getName();
     }
 
     // The Android DownloadManager sometimes appends a number to a file name when it downloads it
     // ex: google.png becomes google-23.png
@@ skipping 29 matching lines @@
                 Handler handler, long updateDelayInMillis) {
             super(context, downloadNotifier, handler, updateDelayInMillis);
         }
 
         @Override
         public void broadcastDownloadSuccessful(DownloadInfo downloadInfo) {
             super.broadcastDownloadSuccessful(downloadInfo);
             mLastDownloadFilePath = downloadInfo.getFilePath();
             mHttpDownloadFinished.notifyCalled();
         }
-
-        @Override
-        public void enqueueDownloadManagerRequest(
-                final DownloadItem item, boolean notifyCompleted) {
-            // Intentionally do not call super, since DownloadManager does not work in test
-            // environment.
-            mEnqueueHttpGetDownloadCallbackHelper.notifyCalled(
-                    item.getDownloadInfo(), notifyCompleted);
-        }
     }
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         cleanUpAllDownloads();
 
         try {
             ApplicationUtils.waitForLibraryDependencies(getInstrumentation());
         } catch (InterruptedException e) {
@@ skipping 29 matching lines @@
     protected void deleteFilesInDownloadDirectory(String...filenames) {
         for (String filename : filenames) {
             final File fileToDelete = new File(DOWNLOAD_DIRECTORY, filename);
             if (fileToDelete.exists()) {
                 assertTrue("Could not delete file that would block this test",
                         fileToDelete.delete());
             }
         }
     }
 }