Update download page to deal with new DANGEROUS_CONTENT state.

chrome/browser/download/download_util.cc

Index: chrome/browser/download/download_util.cc
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc
index 737b829de006e9d6acad8d5d5f9aa1d79ddb6c2c..0a3c87bc01937e8baf02ff9afc0edd9aecb54c39 100644
--- a/chrome/browser/download/download_util.cc
+++ b/chrome/browser/download/download_util.cc
@@ -83,6 +83,28 @@
 // the same value on all platforms.
 static const double PI = 3.141592653589793;
 
+namespace {
+
+const char* GetDangerTypeString(DownloadStateInfo::DangerType danger_type) {
+  switch (danger_type) {
+    case DownloadStateInfo::NOT_DANGEROUS:
+      return "NOT_DANGEROUS";
+    case DownloadStateInfo::DANGEROUS_FILE:
+      return "DANGEROUS_FILE";
+    case DownloadStateInfo::DANGEROUS_URL:
+      return "DANGEROUS_URL";
+    case DownloadStateInfo::DANGEROUS_CONTENT:
+      return "DANGEROUS_CONTENT";
+    default:
+      // We shouldn't be returning a danger type string if it is
+      // MAYBE_DANGEROUS_CONTENT.

[Randy Smith (Not in Mondays), 2011/11/21 01:18:15]

For consistency, I'd think that either NOT_DANGEROUS shouldn't be in the above
list, or MAYBE_DANGEROUS_CONTENT should be combined with NOT_DANGEROUS.

[asanka, 2011/11/21 17:08:57]

Good point. I'll remove the NOT_DANGEROUS string, rather than introduce a string
for MAYBE_DANGEROUS_CONTENT so that we don't define strings we don't use.

+      NOTREACHED();
+  }
+  return NULL;
+}
+
+}  // namespace
+
 namespace download_util {
 
 // How many times to cycle the complete animation. This should be an odd number
@@ -429,10 +451,10 @@ DictionaryValue* CreateDownloadItemValue(DownloadItem* download, int id) {
     if (download->safety_state() == DownloadItem::DANGEROUS) {
       file_value->SetString("state", "DANGEROUS");
       DCHECK(download->GetDangerType() == DownloadStateInfo::DANGEROUS_FILE ||
-             download->GetDangerType() == DownloadStateInfo::DANGEROUS_URL);
+             download->GetDangerType() == DownloadStateInfo::DANGEROUS_URL ||
+             download->GetDangerType() == DownloadStateInfo::DANGEROUS_CONTENT);
       const char* danger_type_value =
-          download->GetDangerType() == DownloadStateInfo::DANGEROUS_FILE ?
-          "DANGEROUS_FILE" : "DANGEROUS_URL";
+          GetDangerTypeString(download->GetDangerType());
       file_value->SetString("danger_type", danger_type_value);
     } else if (download->is_paused()) {
       file_value->SetString("state", "PAUSED");