[Download] Return DownloadInterruptReason from OnStartedCallback

chrome/browser/download/download_item_model.cc

 // Copyright (c) 2012 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/download/download_item_model.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string16.h"
@@ skipping 92 matching lines @@
   return data;
 }
 
 DownloadItemModelData::DownloadItemModelData()
     : should_show_in_shelf_(true),
       should_notify_ui_(false),
       should_prefer_opening_in_browser_(false) {
 }
 
 base::string16 InterruptReasonStatusMessage(int reason) {
-  int string_id = 0;
+  int string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS;
 
-  switch (reason) {
+  switch (static_cast<content::DownloadInterruptReason>(reason)) {
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_ACCESS_DENIED:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_ACCESS_DENIED;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_NO_SPACE:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_DISK_FULL;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_NAME_TOO_LONG:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_PATH_TOO_LONG;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_TOO_LARGE:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_FILE_TOO_LARGE;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_VIRUS_INFECTED:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_VIRUS;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_TRANSIENT_ERROR:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_TEMPORARY_PROBLEM;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_BLOCKED:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_BLOCKED;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_SECURITY_CHECK_FAILED:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_SECURITY_CHECK_FAILED;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_TOO_SHORT:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_FILE_TOO_SHORT;
       break;
+    case content::DOWNLOAD_INTERRUPT_REASON_NETWORK_INVALID_REQUEST:
     case content::DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_NETWORK_ERROR;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_NETWORK_TIMEOUT:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_NETWORK_TIMEOUT;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_NETWORK_DISCONNECTED:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_NETWORK_DISCONNECTED;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_NETWORK_SERVER_DOWN:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_SERVER_DOWN;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_SERVER_FAILED:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_SERVER_PROBLEM;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_SERVER_BAD_CONTENT:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_NO_FILE;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_USER_CANCELED:
       string_id = IDS_DOWNLOAD_STATUS_CANCELLED;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_USER_SHUTDOWN:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_SHUTDOWN;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_CRASH:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_CRASH;
       break;
-    default:
+    case content::DOWNLOAD_INTERRUPT_REASON_NONE:
+      NOTREACHED();
+      // fallthrough
+    case content::DOWNLOAD_INTERRUPT_REASON_SERVER_NO_RANGE:
+    case content::DOWNLOAD_INTERRUPT_REASON_SERVER_PRECONDITION:
+    case content::DOWNLOAD_INTERRUPT_REASON_FILE_FAILED:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS;
-      break;
   }
 
   return l10n_util::GetStringUTF16(string_id);
 }
 
 base::string16 InterruptReasonMessage(int reason) {
-  int string_id = 0;
+  int string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS;
   base::string16 status_text;
 
-  switch (reason) {
+  switch (static_cast<content::DownloadInterruptReason>(reason)) {
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_ACCESS_DENIED:
       string_id = IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_ACCESS_DENIED;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_NO_SPACE:
       string_id = IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_DISK_FULL;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_NAME_TOO_LONG:
       string_id = IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_PATH_TOO_LONG;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_TOO_LARGE:
       string_id = IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_FILE_TOO_LARGE;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_VIRUS_INFECTED:
       string_id = IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_VIRUS;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_TRANSIENT_ERROR:
       string_id = IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_TEMPORARY_PROBLEM;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_BLOCKED:
       string_id = IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_BLOCKED;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_SECURITY_CHECK_FAILED:
       string_id = IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_SECURITY_CHECK_FAILED;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_FILE_TOO_SHORT:
       string_id = IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_FILE_TOO_SHORT;
       break;
+    case content::DOWNLOAD_INTERRUPT_REASON_NETWORK_INVALID_REQUEST:
     case content::DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED:
       string_id = IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_NETWORK_ERROR;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_NETWORK_TIMEOUT:
       string_id = IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_NETWORK_TIMEOUT;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_NETWORK_DISCONNECTED:
       string_id = IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_NETWORK_DISCONNECTED;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_NETWORK_SERVER_DOWN:
       string_id = IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_SERVER_DOWN;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_SERVER_FAILED:
       string_id = IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_SERVER_PROBLEM;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_SERVER_BAD_CONTENT:
       string_id = IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_NO_FILE;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_USER_CANCELED:
       string_id = IDS_DOWNLOAD_STATUS_CANCELLED;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_USER_SHUTDOWN:
       string_id = IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_SHUTDOWN;
       break;
     case content::DOWNLOAD_INTERRUPT_REASON_CRASH:
       string_id = IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_CRASH;
       break;
-    default:
+    case content::DOWNLOAD_INTERRUPT_REASON_NONE:
+      NOTREACHED();
+      // fallthrough
+    case content::DOWNLOAD_INTERRUPT_REASON_SERVER_NO_RANGE:
+    case content::DOWNLOAD_INTERRUPT_REASON_SERVER_PRECONDITION:
+    case content::DOWNLOAD_INTERRUPT_REASON_FILE_FAILED:
       string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS;
-      break;
   }
 
   status_text = l10n_util::GetStringUTF16(string_id);
 
   return status_text;
 }
 
 } // namespace
 
 // -----------------------------------------------------------------------------
@@ skipping 393 matching lines @@
   if (!download_service)
     return;
 
   ChromeDownloadManagerDelegate* delegate =
       download_service->GetDownloadManagerDelegate();
   if (!delegate)
     return;
   delegate->OpenDownloadUsingPlatformHandler(download_);
   RecordDownloadOpenMethod(DOWNLOAD_OPEN_METHOD_USER_PLATFORM);
 }