summaryrefslogtreecommitdiffstats
path: root/views/controls/label_unittest.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-14 18:34:56 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-14 18:34:56 +0000
commit001f08ab3184a370fdd1e8cf4cef05fa15174bd9 (patch)
tree2d808b05a8f8294af7346c0e7f8af472266023e1 /views/controls/label_unittest.cc
parent6784252af99d1da6c63871374d9409998c64ef5b (diff)
downloadchromium_src-001f08ab3184a370fdd1e8cf4cef05fa15174bd9.zip
chromium_src-001f08ab3184a370fdd1e8cf4cef05fa15174bd9.tar.gz
chromium_src-001f08ab3184a370fdd1e8cf4cef05fa15174bd9.tar.bz2
Remove wstring from views. Part 3: Switch accessibility strings to string16.
BUG=68267 TEST=no visible changes; all tests pass Review URL: http://codereview.chromium.org/6192007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71461 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/label_unittest.cc')
-rw-r--r--views/controls/label_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/views/controls/label_unittest.cc b/views/controls/label_unittest.cc
index 504861e..44d101b 100644
--- a/views/controls/label_unittest.cc
+++ b/views/controls/label_unittest.cc
@@ -156,12 +156,12 @@ TEST(LabelTest, TooltipProperty) {
TEST(LabelTest, Accessibility) {
Label label;
- std::wstring test_text(L"My special text.");
- label.SetText(test_text);
+ string16 test_text(ASCIIToUTF16("My special text."));
+ label.SetText(UTF16ToWideHack(test_text));
EXPECT_EQ(AccessibilityTypes::ROLE_STATICTEXT, label.GetAccessibleRole());
- std::wstring name;
+ string16 name;
EXPECT_TRUE(label.GetAccessibleName(&name));
EXPECT_EQ(test_text, name);