Remove DownloadItem::GetUserVerifiedFilePath()

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

 // 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/bind.h"
 #include "base/callback.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_item_model.h"
@@ skipping 17 matching lines @@
 }
 
 void DownloadItemMac::OnDownloadUpdated(content::DownloadItem* download) {
   DCHECK_EQ(download, download_model_.download());
 
   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.
+  if (download->GetTargetFilePath() != lastFilePath_) {
     LoadIcon();
-    lastFilePath_ = download->GetUserVerifiedFilePath();
+    lastFilePath_ = download->GetTargetFilePath();
 
     [item_controller_ updateToolTip];
   }
 
   switch (download->GetState()) {
     case DownloadItem::COMPLETE:
       if (download_model_.ShouldRemoveFromShelfWhenComplete()) {
         [item_controller_ remove];  // We're deleted now!
         return;
       }
@@ skipping 21 matching lines @@
 }
 
 void DownloadItemMac::LoadIcon() {
   IconManager* icon_manager = g_browser_process->icon_manager();
   if (!icon_manager) {
     NOTREACHED();
     return;
   }
 
   // We may already have this particular image cached.
-  base::FilePath file = download_model_.download()->GetUserVerifiedFilePath();
+  base::FilePath file = download_model_.download()->GetTargetFilePath();
   gfx::Image* icon = icon_manager->LookupIconFromFilepath(
       file, IconLoader::ALL);
   if (icon) {
     [item_controller_ setIcon:icon->ToNSImage()];
     return;
   }
 
   // The icon isn't cached, load it asynchronously.
   icon_manager->LoadIcon(file,
                          IconLoader::ALL,
                          base::Bind(&DownloadItemMac::OnExtractIconComplete,
                                     base::Unretained(this)),
                          &cancelable_task_tracker_);
 }
 
 void DownloadItemMac::OnExtractIconComplete(gfx::Image* icon) {
   if (!icon)
     return;
   [item_controller_ setIcon:icon->ToNSImage()];
 }