Remove wstrings from bookmarks, part 12.

views/focus/focus_manager_unittest.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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 "testing/gtest/include/gtest/gtest.h"
 
 #include "app/combobox_model.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
+#include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/rect.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/button/radio_button.h"
 #include "views/controls/combobox/combobox.h"
@@ skipping 295 matching lines @@
   View* child_;
   Widget* widget_;
 
   DISALLOW_COPY_AND_ASSIGN(BorderView);
 };
 
 class DummyComboboxModel : public ComboboxModel {
  public:
   virtual int GetItemCount() { return 10; }
 
-  virtual std::wstring GetItemAt(int index) {
-    return L"Item " + UTF16ToWideHack(base::IntToString16(index));
+  virtual string16 GetItemAt(int index) {
+    return ASCIIToUTF16("Item ") + base::IntToString16(index);
   }
 };
 
 // A View that can act as a pane.
 class PaneView : public View, public FocusTraversable {
  public:
   PaneView() : focus_search_(NULL) {}
 
   // If this method is called, this view will use GetPaneFocusTraversable to
   // have this provided FocusSearch used instead of the default one, allowing
@@ skipping 563 matching lines @@
 
 class TestCombobox : public Combobox, public ComboboxModel {
  public:
   TestCombobox() : Combobox(this) { }
   virtual gfx::NativeView TestGetNativeControlView() {
     return native_wrapper_->GetTestingHandle();
   }
   virtual int GetItemCount() {
     return 10;
   }
-  virtual std::wstring GetItemAt(int index) {
-    return L"Hello combo";
+  virtual string16 GetItemAt(int index) {
+    return ASCIIToUTF16("Hello combo");
   }
 };
 
 class TestTabbedPane : public TabbedPane {
  public:
   TestTabbedPane() { }
   virtual gfx::NativeView TestGetNativeControlView() {
     return native_tabbed_pane_->GetTestingHandle();
   }
 };
@@ skipping 796 matching lines @@
   // Focus manager should be the last one to destruct.
   ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str());
 
   // Clear window_ so that we don't try to close it again.
   window_ = NULL;
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace views