Refactor dangerous download warning text generation into DownloadItemModel.

chrome/browser/ui/cocoa/download/download_item_mac.mm

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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/cocoa/download/download_item_mac.h"
 
 #include "base/callback.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_item_model.h"
 #import "chrome/browser/ui/cocoa/download/download_item_controller.h"
 #include "chrome/browser/ui/cocoa/download/download_util_mac.h"
@@ skipping 11 matching lines @@
 }
 
 DownloadItemMac::~DownloadItemMac() {
   download_model_->download()->RemoveObserver(this);
   icon_consumer_.CancelAllRequests();
 }
 
 void DownloadItemMac::OnDownloadUpdated(content::DownloadItem* download) {
   DCHECK_EQ(download, download_model_->download());
 
-  if ([item_controller_ isDangerousMode] &&
-      download->GetSafetyState() == DownloadItem::DANGEROUS_BUT_VALIDATED) {
+  if ([item_controller_ isDangerousMode] && !download_model_->IsDangerous()) {
     // We have been approved.
     [item_controller_ clearDangerousMode];
   }
 
   if (download->GetUserVerifiedFilePath() != lastFilePath_) {
     // Turns out the file path is "Unconfirmed %d.crdownload" for dangerous
     // downloads. When the download is confirmed, the file is renamed on
     // another thread, so reload the icon if the download filename changes.
     LoadIcon();
     lastFilePath_ = download->GetUserVerifiedFilePath();
@@ skipping 47 matching lines @@
                          base::Bind(&DownloadItemMac::OnExtractIconComplete,
                                     base::Unretained(this)));
 }
 
 void DownloadItemMac::OnExtractIconComplete(IconManager::Handle handle,
                                             gfx::Image* icon) {
   if (!icon)
     return;
   [item_controller_ setIcon:*icon];
 }