Unbreak unit tests. Revert r7564.

chrome/browser/views/download_tab_view.cc

 // Copyright (c) 2006-2008 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/views/download_tab_view.h"
 
 #include <time.h>
 
 #include <algorithm>
 #include <functional>
@@ skipping 267 matching lines @@
   discard_button_->SetEnabled(false);
 
   LayoutDate();
   int dx = kDownloadIconOffset - parent_->big_icon_offset() +
            parent_->big_icon_size() + kInfoPadding;
 
   // File name and URL
   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();
 
   file_name_->SetBounds(dx, parent_->big_icon_offset(),
                         std::min(kFilenameSize,
                                  static_cast<int>(file_name_size.width())),
                         file_name_size.height());
   file_name_->SetVisible(true);
   file_name_->SetEnabled(true);
 
@@ skipping 33 matching lines @@
   discard_button_->SetVisible(false);
   discard_button_->SetEnabled(false);
 
   LayoutDate();
   int dx = kDownloadIconOffset - parent_->big_icon_offset() +
            parent_->big_icon_size() + kInfoPadding;
 
   // 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();
   file_name_->SetBounds(dx, parent_->big_icon_offset(),
                         kFilenameSize - kProgressSize - kSpacer,
                         file_name_size.height());
   file_name_->SetVisible(true);
   file_name_->SetEnabled(false);
 
   GURL url(model_->url());
@@ skipping 70 matching lines @@
   discard_button_->SetVisible(false);
   discard_button_->SetEnabled(false);
 
   LayoutDate();
   int dx = kDownloadIconOffset - parent_->big_icon_offset() +
            parent_->big_icon_size() + kInfoPadding;
 
   // 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();
   file_name_->SetBounds(dx, parent_->big_icon_offset(),
                         kFilenameSize - kProgressSize - kSpacer,
                         file_name_size.height());
   file_name_->SetVisible(true);
   file_name_->SetEnabled(false);
 
   GURL url(model_->url());
@@ skipping 139 matching lines @@
   cancel_->SetEnabled(false);
   time_remaining_->SetVisible(false);
   download_progress_->SetVisible(false);
 
   LayoutDate();
   int dx = kDownloadIconOffset - parent_->big_icon_offset() +
            parent_->big_icon_size() + kInfoPadding;
 
   // 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();
   dangerous_download_warning_->SetBounds(dx, 0,
                                          kFilenameSize, warning_size.height());
   dangerous_download_warning_->SetVisible(true);
 
   GURL url(model_->url());
   download_url_->SetURL(url);
   gfx::Size url_size = download_url_->GetPreferredSize();
@@ skipping 463 matching lines @@
   GetParent()->GetParent()->Layout();
   SchedulePaint();
 }
 
 
 // If we have the icon in our cache, then return it. If not, look it up via the
 // IconManager. Ignore in progress requests (duplicates).
 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)
     LoadIcon(download);
 
   return icon;
 }
 
 // Bypass the caches and perform the Icon extraction directly. This is useful in
 // the case where the download has completed and we want to re-check the file
 // to see if it has an embedded icon (which we couldn't do at download start).
 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);
 }
 
 void DownloadTabView::ClearDownloadInProgress() {
   for (base::hash_set<DownloadItem*>::iterator it = in_progress_.begin();
        it != in_progress_.end(); ++it)
     (*it)->RemoveObserver(this);
   in_progress_.clear();
@@ skipping 226 matching lines @@
     case NOTIFY_DOWNLOAD_STOP:
       DCHECK(profile()->HasCreatedDownloadManager());
       contents_->SetIsLoading(
           profile()->GetDownloadManager()->in_progress_count() > 0,
           NULL);
       break;
     default:
       break;
   }
 }