Defaulting all downloads to go through Chrome network stack

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadTestBase.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadTestBase.java b/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadTestBase.java
index 92bf5620702a0f16949ba717d5f843f53f238e48..30e29dab3e5171e4552ce5f3581330388afab99b 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadTestBase.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadTestBase.java
@@ -99,10 +99,6 @@ public abstract class DownloadTestBase extends ChromeActivityTestCaseBase<Chrome
         assertTrue(hasDownload(lastDownload, null));
     }
 
-    public EnqueueHttpGetDownloadCallbackHelper getHttpGetDownloadCallbackHelper() {
-        return mEnqueueHttpGetDownloadCallbackHelper;
-    }
-
     /**
      * Delete all download entries in DownloadManager and delete the corresponding files.
      */
@@ -156,21 +152,6 @@ public abstract class DownloadTestBase extends ChromeActivityTestCaseBase<Chrome
         }
     }
 
-    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;
@@ -220,15 +201,6 @@ public abstract class DownloadTestBase extends ChromeActivityTestCaseBase<Chrome
             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