Remove DownloadItem::GetUserVerifiedFilePath()

chrome/browser/ui/gtk/download/download_item_gtk.cc

 // 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/gtk/download/download_item_gtk.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/debug/trace_event.h"
 #include "base/metrics/histogram.h"
@@ skipping 301 matching lines @@
     gtk_widget_set_no_show_all(menu_button_, FALSE);
     gtk_widget_show_all(hbox_.get());
     gtk_widget_destroy(dangerous_prompt_);
     gtk_widget_set_size_request(body_.get(), kBodyWidth, -1);
     dangerous_prompt_ = NULL;
 
     // We may free some shelf space for showing more download items.
     parent_shelf_->MaybeShowMoreDownloadItems();
   }
 
-  if (download()->GetUserVerifiedFilePath() != icon_filepath_) {
-    // 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() != icon_filepath_) {
     LoadIcon();
-
     UpdateTooltip();
   }
 
   switch (download()->GetState()) {
     case DownloadItem::CANCELLED:
       StopDownloadProgress();
       gtk_widget_queue_draw(progress_area_.get());
       break;
     case DownloadItem::INTERRUPTED:
       StopDownloadProgress();
@@ skipping 124 matching lines @@
   icon_large_ = image;
   if (download()->IsComplete())
     DownloadItemDrag::SetSource(body_.get(), download(), icon_large_);
   // Else, the download will be made draggable once an OnDownloadUpdated()
   // notification is received with download->IsComplete().
 }
 
 void DownloadItemGtk::LoadIcon() {
   cancelable_task_tracker_.TryCancelAll();
   IconManager* im = g_browser_process->icon_manager();
-  icon_filepath_ = download()->GetUserVerifiedFilePath();
+  icon_filepath_ = download()->GetTargetFilePath();
   im->LoadIcon(icon_filepath_,
                IconLoader::SMALL,
                base::Bind(&DownloadItemGtk::OnLoadSmallIconComplete,
                           base::Unretained(this)),
                &cancelable_task_tracker_);
   im->LoadIcon(icon_filepath_,
                IconLoader::LARGE,
                base::Bind(&DownloadItemGtk::OnLoadLargeIconComplete,
                           base::Unretained(this)),
                &cancelable_task_tracker_);
@@ skipping 442 matching lines @@
   download()->DangerousDownloadValidated();
 }
 
 void DownloadItemGtk::OnDangerousDecline(GtkWidget* button) {
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download",
                            base::Time::Now() - creation_time_);
   if (download()->IsPartialDownload())
     download()->Cancel(true);
   download()->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);
 }