Remove wstring from views. Part 3: Switch accessibility strings to string16....

views/controls/combobox/combobox.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/combobox/combobox.h"
 
 #include "app/combobox_model.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/keycodes/keyboard_codes.h"
@@ skipping 73 matching lines @@
 
 void Combobox::PaintFocusBorder(gfx::Canvas* canvas) {
   if (NativeViewHost::kRenderNativeControlFocus)
     View::PaintFocusBorder(canvas);
 }
 
 AccessibilityTypes::Role Combobox::GetAccessibleRole() {
   return AccessibilityTypes::ROLE_COMBOBOX;
 }
 
-std::wstring Combobox::GetAccessibleValue() {
-  return UTF16ToWideHack(model_->GetItemAt(selected_item_));
+string16 Combobox::GetAccessibleValue() {
+  return model_->GetItemAt(selected_item_);
 }
 
 void Combobox::Focus() {
   // Forward the focus to the wrapper.
   if (native_wrapper_)
     native_wrapper_->SetFocus();
   else
     View::Focus();  // Will focus the RootView window (so we still get
                     // keyboard messages).
 }
 
 void Combobox::ViewHierarchyChanged(bool is_add, View* parent,
                                     View* child) {
   if (is_add && !native_wrapper_ && GetWidget()) {
     native_wrapper_ = NativeComboboxWrapper::CreateWrapper(this);
     AddChildView(native_wrapper_->GetView());
   }
 }
 
 std::string Combobox::GetClassName() const {
   return kViewClassName;
 }
 
 }  // namespace views