Remove webContents check when download starts

chrome/android/java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.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.Manifest.permission;
-import android.app.Activity;
 import android.app.DownloadManager;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Environment;
-import android.os.Handler;
 import android.text.TextUtils;
 import android.webkit.MimeTypeMap;
 import android.webkit.URLUtil;
 
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.CalledByNative;
-import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.UrlConstants;
 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_public.browser.WebContents;
 import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.base.WindowAndroid.PermissionCallback;
 
 import java.io.File;
 
 /**
  * Chrome implementation of the ContentViewDownloadDelegate interface.
  *
  * Listens to POST and GET download events. GET download requests are passed along to the
@@ skipping 142 matching lines @@
                 }
 
                 @Override
                 public void onPostExecute(Void args) {
                     enqueueDownloadManagerRequest(downloadInfo);
                 }
             }.execute();
         } else {
             enqueueDownloadManagerRequest(downloadInfo);
         }
-        return closeBlankTab();
+        return DownloadController.closeTabIfBlank(mTab);
     }
 
     private void launchDownloadInfoBar(DownloadInfo info, File fullDirPath) {
         if (mTab == null) return;
         nativeLaunchDuplicateDownloadInfoBar(ChromeDownloadDelegate.this, mTab, info,
                 new File(fullDirPath, info.getFileName()).toString(), mTab.isIncognito());
     }
 
     /**
      * Enqueue a request to download a file using Android DownloadManager.
      *
      * @param info Download information about the download.
      */
     private void enqueueDownloadManagerRequest(final DownloadInfo info) {
         DownloadManagerService.getDownloadManagerService().enqueueDownloadManagerRequest(
                 new DownloadItem(true, info), true);
-        closeBlankTab();
+        DownloadController.closeTabIfBlank(mTab);
     }
 
     /**
      * Check the external storage and notify user on error.
      *
      * @param fullDirPath The dir path to download a file. Normally this is external storage.
      * @param externalStorageStatus The status of the external storage.
      * @return Whether external storage is ok for downloading.
      */
     private boolean checkExternalStorageAndNotify(
@@ skipping 47 matching lines @@
                 .setFileName(fileName)
                 .setMimeType(mimeType)
                 .setCookie(cookie)
                 .setReferrer(referrer)
                 .setIsGETRequest(true)
                 .build();
         enqueueDownloadManagerRequest(downloadInfo);
     }
 
     /**
-     * Called when download starts.
-     *
-     * @param filename Name of the file.
-     * @param mimeType MIME type of the content.
-     */
-    @CalledByNative
-    private void onDownloadStarted(String filename) {
-        DownloadUtils.showDownloadStartToast(mContext);
-        new Handler().post(new Runnable() {
-            @Override
-            public void run() {
-                closeBlankTab();
-            }
-        });
-    }
-
-    /**
      * If the given MIME type is null, or one of the "generic" types (text/plain
      * or application/octet-stream) map it to a type that Android can deal with.
      * If the given type is not generic, return it unchanged.
      *
      * We have to implement this ourselves as
      * MimeTypeMap.remapGenericMimeType() is not public.
      * See http://crbug.com/407829.
      *
      * @param mimeType MIME type provided by the server.
      * @param url URL of the data being loaded.
@@ skipping 52 matching lines @@
                 File file = new File(filepath);
                 if (file.exists() && !file.delete()) {
                     Log.e(TAG, "Error discarding file: " + filepath);
                 }
                 return null;
             }
         }.execute();
     }
 
     /**
-     * Close a blank tab just opened for the download purpose.
-     * @return true iff the tab was (already) closed.
-     */
-    private boolean closeBlankTab() {
-        if (mTab == null) {
-            // We do not want caller to dismiss infobar.
-            return true;
-        }
-        WebContents contents = mTab.getWebContents();
-        boolean isInitialNavigation = contents == null
-                || contents.getNavigationController().isInitialNavigation();
-        if (isInitialNavigation) {
-            // Tab is created just for download, close it.
-            Activity activity = mTab.getWindowAndroid().getActivity().get();
-            if (!(activity instanceof ChromeActivity)) return true;
-
-            TabModelSelector selector = ((ChromeActivity) activity).getTabModelSelector();
-            if (mTab.isIncognito() && selector.getModel(true).getCount() == 1) return false;
-            return selector == null ? true : selector.closeTab(mTab);
-        }
-        return false;
-    }
-
-    /**
      * For certain download types(OMA for example), android DownloadManager should
      * handle them. Call this function to intercept those downloads.
      *
      * @param url URL to be downloaded.
      * @return whether the DownloadManager should intercept the download.
      */
     public boolean shouldInterceptContextMenuDownload(String url) {
         Uri uri = Uri.parse(url);
         String scheme = uri.normalizeScheme().getScheme();
         if (!UrlConstants.HTTP_SCHEME.equals(scheme) && !UrlConstants.HTTPS_SCHEME.equals(scheme)) {
@@ skipping 30 matching lines @@
 
     protected Context getContext() {
         return mContext;
     }
 
     private native void nativeInit(WebContents webContents);
     private static native String nativeGetDownloadWarningText(String filename);
     private static native void nativeLaunchDuplicateDownloadInfoBar(ChromeDownloadDelegate delegate,
             Tab tab, DownloadInfo downloadInfo, String filePath, boolean isIncognito);
 }