Propagate the SafeBrowsing download protection verdict to the DownloadItem.

chrome/browser/ui/views/download/download_item_view.cc

 // Copyright (c) 2011 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/ui/views/download/download_item_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/i18n/break_iterator.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/views/download/download_shelf_context_menu_view.h"
 #include "chrome/browser/ui/views/download/download_shelf_view.h"
+#include "content/browser/download/download_state_info.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
@@ skipping 211 matching lines @@
 #endif
 
     // Elide giant extensions (this shouldn't currently be hit, but might
     // in future, should we ever notice unsafe giant extensions).
     if (extension.length() > kFileNameMaxLength / 2)
       ui::ElideString(extension, kFileNameMaxLength / 2, &extension);
 
     // The dangerous download label text and icon are different
     // under different cases.
     string16 dangerous_label;
-    if (download->GetDangerType() == DownloadItem::DANGEROUS_URL) {
+    if (download->GetDangerType() == DownloadStateInfo::DANGEROUS_URL) {
       // Safebrowsing shows the download URL leads to malicious file.
       warning_icon_ = rb.GetBitmapNamed(IDR_SAFEBROWSING_WARNING);
       dangerous_label =
           l10n_util::GetStringUTF16(IDS_PROMPT_UNSAFE_DOWNLOAD_URL);
     } else {
       // The download file has dangerous file type (e.g.: an executable).
-      DCHECK(download->GetDangerType() == DownloadItem::DANGEROUS_FILE);
+      DCHECK(download->GetDangerType() == DownloadStateInfo::DANGEROUS_FILE);
       warning_icon_ = rb.GetBitmapNamed(IDR_WARNING);
       if (ChromeDownloadManagerDelegate::IsExtensionDownload(download)) {
         dangerous_label =
             l10n_util::GetStringUTF16(IDS_PROMPT_DANGEROUS_DOWNLOAD_EXTENSION);
       } else {
         ui::ElideString(rootname,
                         kFileNameMaxLength - extension.length(),
                         &rootname);
         string16 filename = rootname + ASCIIToUTF16(".") + extension;
         filename = base::i18n::GetDisplayStringInLTRDirectionality(filename);
@@ skipping 833 matching lines @@
   // If the name has changed, notify assistive technology that the name
   // has changed so they can announce it immediately.
   if (new_name != accessible_name_) {
     accessible_name_ = new_name;
     if (GetWidget()) {
       GetWidget()->NotifyAccessibilityEvent(
           this, ui::AccessibilityTypes::EVENT_NAME_CHANGED, true);
     }
   }
 }