Revert 71167 - Remove wstring from gfx....

views/controls/textfield/native_textfield_views.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 "views/controls/textfield/native_textfield_views.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 386 matching lines @@
            fragments.begin();
        iter != fragments.end();
        iter++) {
     string16 text = model_->GetVisibleText((*iter).begin, (*iter).end);
     // TODO(oshima): This does not give the accurate position due to
     // kerning. Figure out how webkit does this with skia.
     int width = GetFont().GetStringWidth(text);
 
     if ((*iter).selected) {
       canvas->FillRectInt(selection_color, x_offset, y, width, text_height);
-      canvas->DrawStringInt(text, GetFont(), kSelectedTextColor,
-                            x_offset, y, width, text_height);
+      canvas->DrawStringInt(
+          UTF16ToWide(text), GetFont(), kSelectedTextColor,
+          x_offset, y, width, text_height);
     } else {
-      canvas->DrawStringInt(text, GetFont(), text_color,
-                            x_offset, y, width, text_height);
+      canvas->DrawStringInt(
+          UTF16ToWide(text), GetFont(), text_color,
+          x_offset, y, width, text_height);
     }
     x_offset += width;
   }
   canvas->Restore();
 
   if (textfield_->IsEnabled() && is_cursor_visible_ &&
       !model_->HasSelection()) {
     // Paint Cursor. Replace cursor is drawn as rectangle for now.
     canvas->DrawRectInt(kCursorColor,
                         cursor_bounds_.x(),
@@ skipping 330 matching lines @@
 }
 
 void NativeTextfieldViews::TextfieldBorder::SetInsets(int top,
                                                       int left,
                                                       int bottom,
                                                       int right) {
   insets_.Set(top, left, bottom, right);
 }
 
 }  // namespace views