Revert 71169 - Revert 71167 - Remove wstring from gfx....

chrome/browser/chromeos/login/username_view.cc

 // Copyright (c) 2010 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/chromeos/login/username_view.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/rounded_view.h"
 #include "gfx/canvas.h"
@@ skipping 137 matching lines @@
 
     SkPaint paint;
     paint.setShader(composite_shader)->unref();
     canvas.drawPaint(paint);
   }
 
   // Draw the text.
   // Note, direct call of the DrawStringInt method produces the green dots
   // along the text perimeter (when the label is place on the white background).
   SkColor kInvisibleHaloColor = 0x00000000;
-  canvas.DrawStringWithHalo(GetText(), font(), GetColor(), kInvisibleHaloColor,
-                            bounds.x() + margin_width_, bounds.y(),
-                            bounds.width() - 2 * margin_width_, bounds.height(),
-                            flags);
+  canvas.DrawStringWithHalo(WideToUTF16Hack(GetText()), font(), GetColor(),
+                            kInvisibleHaloColor, bounds.x() + margin_width_,
+                            bounds.y(), bounds.width() - 2 * margin_width_,
+                            bounds.height(), flags);
 
   text_image_.reset(new SkBitmap(canvas.ExtractBitmap()));
 
   if (use_fading_for_text) {
     // Fade out only the text in the end. Use regualar background.
     canvas.drawColor(kLabelBackgoundColor, SkXfermode::kSrc_Mode);
     SkShader* image_shader = SkShader::CreateBitmapShader(
         *text_image_,
         SkShader::kRepeat_TileMode,
         SkShader::kRepeat_TileMode);
     SkXfermode* mode = SkXfermode::Create(SkXfermode::kSrcIn_Mode);
     SkShader* composite_shader = new SkComposeShader(gradient_shader,
                                                      image_shader, mode);
     gradient_shader->unref();
     image_shader->unref();
 
     SkPaint paint;
     paint.setShader(composite_shader)->unref();
     canvas.drawPaint(paint);
     text_image_.reset(new SkBitmap(canvas.ExtractBitmap()));
   }
 }
 
 }  // namespace chromeos