Propagate the SafeBrowsing download protection verdict to the DownloadItem.

chrome/browser/download/download_util.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.
 //
 // Download utility implementation
 
 #include "chrome/browser/download/download_util.h"
 
 #if defined(OS_WIN)
 #include <shobjidl.h>
@@ skipping 17 matching lines @@
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/time_format.h"
 #include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_file.h"
 #include "content/browser/download/download_item.h"
 #include "content/browser/download/download_manager.h"
+#include "content/browser/download/download_state_info.h"
 #include "content/browser/download/download_types.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_util.h"
@@ skipping 372 matching lines @@
   file_value->SetString("file_name", file_name);
   file_value->SetString("url", download->GetURL().spec());
   file_value->SetBoolean("otr", download->is_otr());
   file_value->SetInteger("total", static_cast<int>(download->total_bytes()));
   file_value->SetBoolean("file_externally_removed",
                          download->file_externally_removed());
 
   if (download->IsInProgress()) {
     if (download->safety_state() == DownloadItem::DANGEROUS) {
       file_value->SetString("state", "DANGEROUS");
-      DCHECK(download->GetDangerType() == DownloadItem::DANGEROUS_FILE ||
-             download->GetDangerType() == DownloadItem::DANGEROUS_URL);
+      DCHECK(download->GetDangerType() == DownloadStateInfo::DANGEROUS_FILE ||
+             download->GetDangerType() == DownloadStateInfo::DANGEROUS_URL);
       const char* danger_type_value =
-          download->GetDangerType() == DownloadItem::DANGEROUS_FILE ?
+          download->GetDangerType() == DownloadStateInfo::DANGEROUS_FILE ?
           "DANGEROUS_FILE" : "DANGEROUS_URL";
       file_value->SetString("danger_type", danger_type_value);
     } else if (download->is_paused()) {
       file_value->SetString("state", "PAUSED");
     } else {
       file_value->SetString("state", "IN_PROGRESS");
     }
 
     file_value->SetString("progress_status_text",
         GetProgressStatusText(download));
@@ skipping 121 matching lines @@
   return DownloadFile::GetUniquePathNumberWithSuffix(
       path, FILE_PATH_LITERAL(".crdownload"));
 }
 
 FilePath GetCrDownloadPath(const FilePath& suggested_path) {
   return DownloadFile::AppendSuffixToPath(
       suggested_path, FILE_PATH_LITERAL(".crdownload"));
 }
 
 }  // namespace download_util