Allow user to pause/resume incognito downloads

chrome/browser/android/download/download_manager_service.cc

 // 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.
 
 #include "chrome/browser/android/download/download_manager_service.h"
 
 #include "base/android/jni_string.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 61 matching lines @@
       is_history_query_complete_(false) {
   DownloadControllerBase::Get()->SetDefaultDownloadFileName(
       l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME));
 }
 
 DownloadManagerService::~DownloadManagerService() {}
 
 void DownloadManagerService::ResumeDownload(
     JNIEnv* env,
     jobject obj,
-    const JavaParamRef<jstring>& jdownload_guid) {
+    const JavaParamRef<jstring>& jdownload_guid,
+    bool is_off_the_record) {
   std::string download_guid = ConvertJavaStringToUTF8(env, jdownload_guid);
-  if (is_history_query_complete_)
-    ResumeDownloadInternal(download_guid);
+  if (is_history_query_complete_ || is_off_the_record)
+    ResumeDownloadInternal(download_guid, is_off_the_record);
   else
     EnqueueDownloadAction(download_guid, RESUME);
 }
 
 void DownloadManagerService::PauseDownload(
     JNIEnv* env,
     jobject obj,
-    const JavaParamRef<jstring>& jdownload_guid) {
+    const JavaParamRef<jstring>& jdownload_guid,
+    bool is_off_the_record) {
   std::string download_guid = ConvertJavaStringToUTF8(env, jdownload_guid);
-  if (is_history_query_complete_)
-    PauseDownloadInternal(download_guid);
+  if (is_history_query_complete_ || is_off_the_record)
+    PauseDownloadInternal(download_guid, is_off_the_record);
   else
     EnqueueDownloadAction(download_guid, PAUSE);
 }
 
 void DownloadManagerService::GetAllDownloads(JNIEnv* env,
                                              const JavaParamRef<jobject>& obj) {
   if (is_history_query_complete_)
     GetAllDownloadsInternal();
   else
     EnqueueDownloadAction(std::string(), INITIALIZE_UI);
@@ skipping 35 matching lines @@
 }
 
 
 void DownloadManagerService::CancelDownload(
     JNIEnv* env,
     jobject obj,
     const JavaParamRef<jstring>& jdownload_guid,
     bool is_off_the_record,
     bool is_notification_dismissed) {
   std::string download_guid = ConvertJavaStringToUTF8(env, jdownload_guid);
-
   DownloadController::RecordDownloadCancelReason(
       is_notification_dismissed ?
           DownloadController::CANCEL_REASON_NOTIFICATION_DISMISSED :
           DownloadController::CANCEL_REASON_ACTION_BUTTON);
-  // Incognito download can only be cancelled in the same browser session, no
-  // need to wait for download history.
-  if (is_off_the_record) {
-    CancelDownloadInternal(download_guid, true);
-    return;
-  }
-
-  if (is_history_query_complete_)
-    CancelDownloadInternal(download_guid, false);
+  if (is_history_query_complete_ || is_off_the_record)
+    CancelDownloadInternal(download_guid, is_off_the_record);
   else
     EnqueueDownloadAction(download_guid, CANCEL);
 }
 
 void DownloadManagerService::OnHistoryQueryComplete() {
   is_history_query_complete_ = true;
   for (auto iter = pending_actions_.begin(); iter != pending_actions_.end();
        ++iter) {
     DownloadAction action = iter->second;
     std::string download_guid = iter->first;
     switch (action) {
       case RESUME:
-        ResumeDownloadInternal(download_guid);
+        ResumeDownloadInternal(download_guid, false);
         break;
       case PAUSE:
-        PauseDownloadInternal(download_guid);
+        PauseDownloadInternal(download_guid, false);
         break;
       case CANCEL:
         CancelDownloadInternal(download_guid, false);
         break;
       case INITIALIZE_UI:
         GetAllDownloadsInternal();
         break;
       default:
         NOTREACHED();
         break;
     }
   }
   pending_actions_.clear();
 }
 
 void DownloadManagerService::ResumeDownloadInternal(
-    const std::string& download_guid) {
-  content::DownloadManager* manager = GetDownloadManager(false);
+    const std::string& download_guid, bool is_off_the_record) {
+  content::DownloadManager* manager = GetDownloadManager(is_off_the_record);
   if (!manager) {
     OnResumptionFailed(download_guid);
     return;
   }
   content::DownloadItem* item = manager->GetDownloadByGuid(download_guid);
   if (!item) {
     OnResumptionFailed(download_guid);
     return;
   }
   if (!item->CanResume()) {
@@ skipping 12 matching lines @@
   if (!manager)
     return;
   content::DownloadItem* item = manager->GetDownloadByGuid(download_guid);
   if (item) {
     item->Cancel(true);
     item->RemoveObserver(DownloadControllerBase::Get());
   }
 }
 
 void DownloadManagerService::PauseDownloadInternal(
-    const std::string& download_guid) {
-  content::DownloadManager* manager = GetDownloadManager(false);
+    const std::string& download_guid, bool is_off_the_record) {
+  content::DownloadManager* manager = GetDownloadManager(is_off_the_record);
   if (!manager)
     return;
   content::DownloadItem* item = manager->GetDownloadByGuid(download_guid);
   if (item) {
     item->Pause();
     item->RemoveObserver(DownloadControllerBase::Get());
   }
 }
 
 void DownloadManagerService::EnqueueDownloadAction(
@@ skipping 46 matching lines @@
     resume_callback_for_testing_.Run(false);
 }
 
 content::DownloadManager* DownloadManagerService::GetDownloadManager(
     bool is_off_the_record) {
   Profile* profile = ProfileManager::GetActiveUserProfile();
   if (is_off_the_record)
     profile = profile->GetOffTheRecordProfile();
   return content::BrowserContext::GetDownloadManager(profile);
 }