Unbreak unit tests. Revert r7564.

chrome/browser/views/download_item_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_item_view.h"
 
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/string_util.h"
@@ skipping 183 matching lines @@
     save_button_ = new views::NativeButton(
         l10n_util::GetString(IDS_SAVE_DOWNLOAD));
     save_button_->set_enforce_dlu_min_size(false);
     save_button_->SetListener(this);
     discard_button_ = new views::NativeButton(
         l10n_util::GetString(IDS_DISCARD_DOWNLOAD));
     discard_button_->SetListener(this);
     discard_button_->set_enforce_dlu_min_size(false);
     AddChildView(save_button_);
     AddChildView(discard_button_);
-    std::wstring file_name = download->original_name().ToWStringHack();
+    std::wstring file_name = download->original_name();
 
     // Ensure the file name is not too long.
 
     // Extract the file extension (if any).
     std::wstring extension = file_util::GetFileExtensionFromPath(file_name);
     std::wstring rootname = 
         file_util::GetFilenameWithoutExtensionFromPath(file_name);
 
     // Elide giant extensions (this shouldn't currently be hit, but might
     // in future, should we ever notice unsafe giant extensions).
@@ skipping 235 matching lines @@
 
       canvas->restore();
     }
   }
 
   // Print the text, left aligned and always print the file extension.
   // Last value of x was the end of the right image, just before the button.
   // Note that in dangerous mode we use a label (as the text is multi-line).
   if (!IsDangerousMode()) {
     std::wstring filename = 
-        gfx::ElideFilename(download_->GetFileName().ToWStringHack(),
+        gfx::ElideFilename(download_->GetFileName(),
                            font_,
                            kTextWidth);
 
     if (show_status_text_) {
       int y = box_y_ + kVerticalPadding;
 
       // Draw the file's name.
       canvas->DrawStringInt(filename, font_, kFileNameColor,
                             download_util::kSmallProgressIconSize, y,
                             kTextWidth, font_.height());
 
       y += font_.height() + kVerticalTextPadding;
 
       canvas->DrawStringInt(status_text_, font_, kStatusColor,
                             download_util::kSmallProgressIconSize, y,
                             kTextWidth, font_.height());
     } else {
       int y = box_y_ + (box_height_ - font_.height()) / 2;
 
       // Draw the file's name.
       canvas->DrawStringInt(filename, font_, kFileNameColor,
                             download_util::kSmallProgressIconSize, y,
                             kTextWidth, font_.height());
     }
   }
 
   // Paint the icon.
   IconManager* im = g_browser_process->icon_manager();
   SkBitmap* icon = IsDangerousMode() ? warning_icon_ :
-      im->LookupIcon(download_->full_path().ToWStringHack(), IconLoader::SMALL);
+      im->LookupIcon(download_->full_path(), IconLoader::SMALL);
 
   // We count on the fact that the icon manager will cache the icons and if one
   // is available, it will be cached here. We *don't* want to request the icon
   // to be loaded here, since this will also get called if the icon can't be
   // loaded, in which case LookupIcon will always be NULL. The loading will be
   // triggered only when we think the status might change.
   if (icon) {
     if (!IsDangerousMode()) {
       if (download_->state() == DownloadItem::IN_PROGRESS) {
         download_util::PaintDownloadProgress(canvas, this, 0, 0,
@@ skipping 208 matching lines @@
   if (IsDangerousMode())
     return true;
 
   if (!starting_drag_) {
     starting_drag_ = true;
     drag_start_point_ = event.location();
   }
   if (dragging_) {
     if (download_->state() == DownloadItem::COMPLETE) {
       IconManager* im = g_browser_process->icon_manager();
-      SkBitmap* icon = im->LookupIcon(download_->full_path().ToWStringHack(),
+      SkBitmap* icon = im->LookupIcon(download_->full_path(),
                                       IconLoader::SMALL);
       if (icon)
         download_util::DragDownload(download_, icon);
     }
   } else if (win_util::IsDrag(drag_start_point_.ToPOINT(),
                               event.location().ToPOINT())) {
     dragging_ = true;
   }
   return true;
 }
@@ skipping 13 matching lines @@
 }
 
 void DownloadItemView::OnExtractIconComplete(IconManager::Handle handle,
                                              SkBitmap* icon_bitmap) {
   if (icon_bitmap)
     GetParent()->SchedulePaint();
 }
 
 void DownloadItemView::LoadIcon() {
   IconManager* im = g_browser_process->icon_manager();
-  im->LoadIcon(download_->full_path().ToWStringHack(), IconLoader::SMALL,
+  im->LoadIcon(download_->full_path(), IconLoader::SMALL,
                &icon_consumer_,
                NewCallback(this, &DownloadItemView::OnExtractIconComplete));
 }
 
 gfx::Size DownloadItemView::GetButtonSize() {
   DCHECK(save_button_ && discard_button_);
   gfx::Size size;
 
   // We cache the size when successfully retrieved, not for performance reasons
   // but because if this DownloadItemView is being animated while the tab is
@@ skipping 52 matching lines @@
     sp_index = text.find(L" ", sp_index + 1);
   }
 
   // If we have a line with no space, we won't cut it.
   if (min_width == -1)
     size = dangerous_download_label_->GetPreferredSize();
 
   dangerous_download_label_->SetBounds(0, 0, size.width(), size.height());
   dangerous_download_label_sized_ = true;
 }