summaryrefslogtreecommitdiffstats
path: root/views/controls/progress_bar_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/progress_bar_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/progress_bar_unittest.cc')
-rw-r--r--views/controls/progress_bar_unittest.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/views/controls/progress_bar_unittest.cc b/views/controls/progress_bar_unittest.cc
index 362f48f..55acfd4 100644
--- a/views/controls/progress_bar_unittest.cc
+++ b/views/controls/progress_bar_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "views/controls/progress_bar.h"
@@ -49,10 +50,10 @@ TEST(ProgressBarTest, Accessibility) {
EXPECT_EQ(AccessibilityTypes::ROLE_PROGRESSBAR, bar.GetAccessibleRole());
- std::wstring name;
+ string16 name;
EXPECT_FALSE(bar.GetAccessibleName(&name));
- EXPECT_EQ(std::wstring(), name);
- std::wstring accessible_name = L"My progress bar";
+ EXPECT_EQ(string16(), name);
+ string16 accessible_name = ASCIIToUTF16("My progress bar");
bar.SetAccessibleName(accessible_name);
EXPECT_TRUE(bar.GetAccessibleName(&name));
EXPECT_EQ(accessible_name, name);