Propagate the SafeBrowsing download protection verdict to the DownloadItem.

chrome/browser/download/download_extension_api.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/download/download_extension_api.h"
 
 #include <algorithm>
 #include <cctype>
 #include <iterator>
 #include <set>
@@ skipping 14 matching lines @@
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/extensions/extension_event_names.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/icon_loader.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "content/browser/download/download_file_manager.h"
 #include "content/browser/download/download_item.h"
+#include "content/browser/download/download_state_info.h"
 #include "content/browser/download/download_types.h"
 #include "content/browser/download/interrupt_reasons.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "net/http/http_util.h"
 #include "net/url_request/url_request.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // Error messages
 const char kNotImplemented[] = "NotImplemented";
 const char kGenericError[] = "I'm afraid I can't do that.";
 const char kInvalidURL[] = "Invalid URL";
 
 // Parameter keys
 const char kBodyKey[] = "body";
 const char kBytesReceivedKey[] = "bytesReceived";
 const char kDangerAcceptedKey[] = "dangerAccepted";
+const char kDangerContent[] = "content";
 const char kDangerFile[] = "file";
 const char kDangerKey[] = "danger";
 const char kDangerSafe[] = "safe";
 const char kDangerUrl[] = "url";
 const char kEndTimeKey[] = "endTime";
 const char kErrorKey[] = "error";
 const char kFileSizeKey[] = "fileSize";
 const char kFilenameKey[] = "filename";
 const char kHeaderNameKey[] = "name";
 const char kHeaderValueKey[] = "value";
 const char kHeadersKey[] = "headers";
 const char kIdKey[] = "id";
 const char kMethodKey[] = "method";
 const char kMimeKey[] = "mime";
 const char kPausedKey[] = "paused";
 const char kSaveAsKey[] = "saveAs";
 const char kStartTimeKey[] = "startTime";
 const char kStateComplete[] = "complete";
 const char kStateInProgress[] = "in_progress";
 const char kStateInterrupted[] = "interrupted";
 const char kStateKey[] = "state";
 const char kTotalBytesKey[] = "totalBytes";
 const char kUrlKey[] = "url";
 
-const char* DangerString(DownloadItem::DangerType danger) {
+const char* DangerString(DownloadStateInfo::DangerType danger) {
   switch (danger) {
-    case DownloadItem::NOT_DANGEROUS: return kDangerSafe;
-    case DownloadItem::DANGEROUS_FILE: return kDangerFile;
-    case DownloadItem::DANGEROUS_URL: return kDangerUrl;
+    case DownloadStateInfo::MAYBE_DANGEROUS_CONTENT:
+    case DownloadStateInfo::NOT_DANGEROUS: return kDangerSafe;
+    case DownloadStateInfo::DANGEROUS_FILE: return kDangerFile;
+    case DownloadStateInfo::DANGEROUS_URL: return kDangerUrl;
+    case DownloadStateInfo::DANGEROUS_CONTENT: return kDangerContent;
     default:
       NOTREACHED();
       return "";
   }
 }
 
 const char* StateString(DownloadItem::DownloadState state) {
   switch (state) {
     case DownloadItem::IN_PROGRESS: return kStateInProgress;
     case DownloadItem::COMPLETE: return kStateComplete;
@@ skipping 447 matching lines @@
   ListValue args;
   args.Append(arg);
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
   profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
       event_name,
       json_args,
       profile_,
       GURL());
 }