diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/table/table_view_unittest.cc | 4 | ||||
| -rw-r--r-- | views/focus/focus_manager_unittest.cc | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/views/controls/table/table_view_unittest.cc b/views/controls/table/table_view_unittest.cc index bee0c19..c6954fa 100644 --- a/views/controls/table/table_view_unittest.cc +++ b/views/controls/table/table_view_unittest.cc @@ -7,7 +7,7 @@ #include "app/table_model.h" #include "app/table_model_observer.h" #include "base/message_loop.h" -#include "base/string_util.h" +#include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "views/controls/table/table_view.h" @@ -94,7 +94,7 @@ int TestTableModel::RowCount() { } std::wstring TestTableModel::GetText(int row, int column_id) { - return IntToWString(rows_[row][column_id]); + return UTF8ToWide(base::IntToString(rows_[row][column_id])); } void TestTableModel::SetObserver(TableModelObserver* observer) { diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc index 4b23932..955a83a 100644 --- a/views/focus/focus_manager_unittest.cc +++ b/views/focus/focus_manager_unittest.cc @@ -7,7 +7,8 @@ #include "app/combobox_model.h" #include "base/keyboard_codes.h" #include "base/logging.h" -#include "base/string_util.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" @@ -322,7 +323,7 @@ class DummyComboboxModel : public ComboboxModel { virtual int GetItemCount() { return 10; } virtual std::wstring GetItemAt(int index) { - return L"Item " + IntToWString(index); + return L"Item " + UTF16ToWideHack(base::IntToString16(index)); } }; |