Unbreak unit tests. Revert r7564.

tbr=jhawkins

Review URL: http://codereview.chromium.org/16522

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7571 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 8 deletions

diff --git a/chrome/browser/views/download_tab_view.cc b/chrome/browser/views/download_tab_view.cc
index 474f0a7..b0d7c77 100644
--- a/chrome/browser/views/download_tab_view.cc
+++ b/chrome/browser/views/download_tab_view.cc
@@ -285,8 +285,7 @@ void DownloadItemTabView::LayoutComplete() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   ChromeFont font = rb.GetFont(ResourceBundle::WebFont);
   file_name_->SetText(
-    gfx::ElideFilename(model_->GetFileName().ToWStringHack(), font,
-                       kFilenameSize));
+    gfx::ElideFilename(model_->GetFileName(), font, kFilenameSize));
 
   gfx::Size file_name_size = file_name_->GetPreferredSize();
 
@@ -340,7 +339,7 @@ void DownloadItemTabView::LayoutCancelled() {
   // File name and URL, truncated to show cancelled status
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   ChromeFont font = rb.GetFont(ResourceBundle::WebFont);
-  file_name_->SetText(gfx::ElideFilename(model_->GetFileName().ToWStringHack(),
+  file_name_->SetText(gfx::ElideFilename(model_->GetFileName(), 
                                          font, 
                                          kFilenameSize));
   gfx::Size file_name_size = file_name_->GetPreferredSize();
@@ -431,7 +430,7 @@ void DownloadItemTabView::LayoutInProgress() {
   // File name and URL, truncated to show progress status
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   ChromeFont font = rb.GetFont(ResourceBundle::WebFont);
-  file_name_->SetText(gfx::ElideFilename(model_->GetFileName().ToWStringHack(),
+  file_name_->SetText(gfx::ElideFilename(model_->GetFileName(),
                                          font,
                                          kFilenameSize));
   gfx::Size file_name_size = file_name_->GetPreferredSize();
@@ -591,7 +590,7 @@ void DownloadItemTabView::LayoutPromptDangerousDownload() {
 
   // Warning message and URL.
   std::wstring file_name;
-  ElideString(model_->original_name().ToWStringHack(), kFileNameMaxLength, &file_name);
+  ElideString(model_->original_name(), kFileNameMaxLength, &file_name);
   dangerous_download_warning_->SetText(
       l10n_util::GetStringF(IDS_PROMPT_DANGEROUS_DOWNLOAD, file_name));
   gfx::Size warning_size = dangerous_download_warning_->GetPreferredSize();
@@ -1075,8 +1074,7 @@ void DownloadTabView::SetDownloads(std::vector<DownloadItem*>& downloads) {
 SkBitmap* DownloadTabView::LookupIcon(DownloadItem* download) {
   IconManager* im = g_browser_process->icon_manager();
   // Fast look up.
-  SkBitmap* icon = im->LookupIcon(download->full_path().ToWStringHack(),
-                                  IconLoader::NORMAL);
+  SkBitmap* icon = im->LookupIcon(download->full_path(), IconLoader::NORMAL);
 
   // Expensive look up.
   if (!icon)
@@ -1091,7 +1089,7 @@ SkBitmap* DownloadTabView::LookupIcon(DownloadItem* download) {
 void DownloadTabView::LoadIcon(DownloadItem* download) {
   IconManager* im = g_browser_process->icon_manager();
   IconManager::Handle h =
-      im->LoadIcon(download->full_path().ToWStringHack(), IconLoader::NORMAL,
+      im->LoadIcon(download->full_path(), IconLoader::NORMAL,
                    &icon_consumer_,
                    NewCallback(this, &DownloadTabView::OnExtractIconComplete));
   icon_consumer_.SetClientData(im, h, download);