Revert 71167 - Remove wstring from gfx....

chrome/browser/ui/views/download_item_view.cc

 // Copyright (c) 2011 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/views/download_item_view.h"
 
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 497 matching lines @@
       // If text is light-on-dark, lightening it alone will do nothing.
       // Therefore we mute luminance a wee bit before drawing in this case.
       if (color_utils::RelativeLuminance(file_name_color) > 0.5)
           file_name_color = SkColorSetRGB(
               static_cast<int>(kDownloadItemLuminanceMod *
                                SkColorGetR(file_name_color)),
               static_cast<int>(kDownloadItemLuminanceMod *
                                SkColorGetG(file_name_color)),
               static_cast<int>(kDownloadItemLuminanceMod *
                                SkColorGetB(file_name_color)));
-      canvas->DrawStringInt(WideToUTF16Hack(status_text_), font_,
-                            file_name_color, mirrored_x, y, kTextWidth,
-                            font_.GetHeight());
+      canvas->DrawStringInt(status_text_, font_, file_name_color,
+                            mirrored_x, y, kTextWidth, font_.GetHeight());
     }
   }
 
   // Paint the background images.
   int x = kLeftPadding;
   canvas->Save();
   if (base::i18n::IsRTL()) {
     // Since we do not have the mirrored images for
     // (hot_)body_image_set->top_left, (hot_)body_image_set->left,
     // (hot_)body_image_set->bottom_left, and drop_down_image_set,
@@ skipping 96 matching lines @@
 
     int mirrored_x = MirroredXWithWidthInsideView(
         download_util::kSmallProgressIconSize, kTextWidth);
     SkColor file_name_color = GetThemeProvider()->GetColor(
         BrowserThemeProvider::COLOR_BOOKMARK_TEXT);
     int y =
         box_y_ + (show_status_text_ ? kVerticalPadding :
                                       (box_height_ - font_.GetHeight()) / 2);
 
     // Draw the file's name.
-    canvas->DrawStringInt(filename, font_,
+    canvas->DrawStringInt(UTF16ToWide(filename), font_,
                           IsEnabled() ? file_name_color :
                                         kFileNameDisabledColor,
                           mirrored_x, y, kTextWidth, font_.GetHeight());
   }
 
   // Paint the icon.
   IconManager* im = g_browser_process->icon_manager();
   SkBitmap* icon = IsDangerousMode() ? warning_icon_ :
       im->LookupIcon(download_->GetUserVerifiedFilePath(), IconLoader::SMALL);
 
@@ skipping 426 matching lines @@
 
   // If the name has changed, call SetAccessibleName and notify
   // assistive technology that the name has changed so they can
   // announce it immediately.
   if (new_name != current_name) {
     SetAccessibleName(new_name);
     if (GetWidget())
       NotifyAccessibilityEvent(AccessibilityTypes::EVENT_NAME_CHANGED);
   }
 }