Propagate the SafeBrowsing download protection verdict to the DownloadItem.

chrome/browser/ui/gtk/download/download_item_gtk.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/gtk/download/download_item_gtk.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
@@ skipping 542 matching lines @@
 
 void DownloadItemGtk::UpdateDangerWarning() {
   if (dangerous_prompt_) {
     UpdateDangerIcon();
 
     // We create |dangerous_warning| as a wide string so we can more easily
     // calculate its length in characters.
     string16 dangerous_warning;
 
     // The dangerous download label text is different for different cases.
-    if (get_download()->GetDangerType() == DownloadItem::DANGEROUS_URL) {
+    if (get_download()->GetDangerType() == DownloadStateInfo::DANGEROUS_URL) {
       // Safebrowsing shows the download URL leads to malicious file.
       dangerous_warning =
           l10n_util::GetStringUTF16(IDS_PROMPT_UNSAFE_DOWNLOAD_URL);
     } else {
       // It's a dangerous file type (e.g.: an executable).
       DCHECK(get_download()->GetDangerType() ==
-             DownloadItem::DANGEROUS_FILE);
+             DownloadStateInfo::DANGEROUS_FILE);
       if (ChromeDownloadManagerDelegate::IsExtensionDownload(get_download())) {
         dangerous_warning =
             l10n_util::GetStringUTF16(IDS_PROMPT_DANGEROUS_DOWNLOAD_EXTENSION);
       } else {
         string16 elided_filename = ui::ElideFilename(
             get_download()->target_name(), gfx::Font(), kTextWidth);
         dangerous_warning =
             l10n_util::GetStringFUTF16(IDS_PROMPT_DANGEROUS_DOWNLOAD,
                                        elided_filename);
       }
@@ skipping 29 matching lines @@
     // change the label above.
     gtk_widget_size_request(dangerous_hbox_.get(), &req);
     dangerous_hbox_full_width_ = req.width;
     dangerous_hbox_start_width_ = dangerous_hbox_full_width_ - label_width;
   }
 }
 
 void DownloadItemGtk::UpdateDangerIcon() {
   if (theme_service_->UsingNativeTheme()) {
     const char* stock =
-        get_download()->GetDangerType() == DownloadItem::DANGEROUS_URL ?
+        get_download()->GetDangerType() == DownloadStateInfo::DANGEROUS_URL ?
         GTK_STOCK_DIALOG_ERROR : GTK_STOCK_DIALOG_WARNING;
     gtk_image_set_from_stock(
         GTK_IMAGE(dangerous_image_), stock, GTK_ICON_SIZE_SMALL_TOOLBAR);
   } else {
     // Set the warning icon.
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     int pixbuf_id =
-        get_download()->GetDangerType() == DownloadItem::DANGEROUS_URL ?
+        get_download()->GetDangerType() == DownloadStateInfo::DANGEROUS_URL ?
         IDR_SAFEBROWSING_WARNING : IDR_WARNING;
     GdkPixbuf* download_pixbuf = rb.GetNativeImageNamed(pixbuf_id);
     gtk_image_set_from_pixbuf(GTK_IMAGE(dangerous_image_), download_pixbuf);
   }
 }
 
 // static
 void DownloadItemGtk::InitNineBoxes() {
   if (body_nine_box_normal_)
     return;
@@ skipping 245 matching lines @@
   get_download()->DangerousDownloadValidated();
 }
 
 void DownloadItemGtk::OnDangerousDecline(GtkWidget* button) {
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download",
                            base::Time::Now() - creation_time_);
   if (get_download()->IsPartialDownload())
     get_download()->Cancel(true);
   get_download()->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);
 }