Move DownloadControllerAndroid from content/ to chrome/

chrome/android/java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java

Index: chrome/android/java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java
index 26e1691391d3170f225c49b2c6807f423cf88e02..9cd9f7aa63ff9923ac7f0964fc9c8892fafec10e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java
@@ -32,9 +32,6 @@ import org.chromium.chrome.browser.infobar.SimpleConfirmInfoBarBuilder;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
-import org.chromium.content.browser.ContentViewDownloadDelegate;
-import org.chromium.content.browser.DownloadController;
-import org.chromium.content.browser.DownloadInfo;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.base.WindowAndroid.PermissionCallback;
@@ -51,7 +48,7 @@ import java.io.File;
  *
  * Prompts the user when a dangerous file is downloaded. Auto-opens PDFs after downloading.
  */
-public class ChromeDownloadDelegate implements ContentViewDownloadDelegate {
+public class ChromeDownloadDelegate {
     private static final String TAG = "Download";
 
     private class DangerousDownloadListener implements SimpleConfirmInfoBarBuilder.Listener {
@@ -154,14 +151,16 @@ public class ChromeDownloadDelegate implements ContentViewDownloadDelegate {
         mDangerousDownloadListener = new DangerousDownloadListener();
     }
 
-    @Override
-    public void requestHttpGetDownload(DownloadInfo downloadInfo, boolean mustDownload) {
+    @CalledByNative
+    public void requestHttpGetDownload(String url, String userAgent, String contentDisposition,

[Ted C, 2016/06/15 17:44:11]

should this be private now?

[Jinsuk Kim, 2016/06/15 21:05:30]

Done.

+            String mimeType, String cookie, String referer, boolean hasUserGesture,
+            String filename, long contentLength, boolean mustDownload) {
         // If we're dealing with A/V content that's not explicitly marked for download, check if it
         // is streamable.
         if (!mustDownload) {
             // Query the package manager to see if there's a registered handler that matches.
             Intent intent = new Intent(Intent.ACTION_VIEW);
-            intent.setDataAndType(Uri.parse(downloadInfo.getUrl()), downloadInfo.getMimeType());
+            intent.setDataAndType(Uri.parse(url), mimeType);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             // If the intent is resolved to ourselves, we don't want to attempt to load the url
             // only to try and download it again.
@@ -169,6 +168,18 @@ public class ChromeDownloadDelegate implements ContentViewDownloadDelegate {
                 return;
             }
         }
+        DownloadInfo downloadInfo = new DownloadInfo.Builder()
+                .setUrl(url)
+                .setUserAgent(userAgent)
+                .setContentDisposition(contentDisposition)
+                .setMimeType(mimeType)
+                .setCookie(cookie)
+                .setReferer(referer)
+                .setHasUserGesture(hasUserGesture)
+                .setFileName(filename)
+                .setContentLength(contentLength)
+                .setIsGETRequest(true)
+                .build();
         onDownloadStartNoStream(downloadInfo);
     }
 
@@ -272,8 +283,8 @@ public class ChromeDownloadDelegate implements ContentViewDownloadDelegate {
      * @param filename File name of the download item.
      * @param downloadGuid GUID of the download.
      */
-    @Override
-    public void onDangerousDownload(String filename, String downloadGuid) {
+    @CalledByNative
+    private void onDangerousDownload(String filename, String downloadGuid) {
         DownloadInfo downloadInfo = new DownloadInfo.Builder()
                 .setFileName(filename)
                 .setDescription(filename)
@@ -281,8 +292,8 @@ public class ChromeDownloadDelegate implements ContentViewDownloadDelegate {
         confirmDangerousDownload(downloadInfo);
     }
 
-    @Override
-    public void requestFileAccess(final long callbackId) {
+    @CalledByNative
+    private void requestFileAccess(final long callbackId) {
         if (mTab == null) {
             // TODO(tedchoc): Show toast (only when activity is alive).
             DownloadController.getInstance().onRequestFileAccessResult(callbackId, false);
@@ -468,8 +479,8 @@ public class ChromeDownloadDelegate implements ContentViewDownloadDelegate {
      * @param filename Name of the file.
      * @param mimeType MIME type of the content.
      */
-    @Override
-    public void onDownloadStarted(String filename, String mimeType) {
+    @CalledByNative
+    private void onDownloadStarted(String filename, String mimeType) {
         if (!isDangerousFile(filename, mimeType)) {
             showDownloadStartNotification();
             closeBlankTab();