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

views/controls/progress_bar_unittest.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 "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/controls/progress_bar.h"
 
 namespace views {
 
 TEST(ProgressBarTest, ProgressProperty) {
   ProgressBar bar;
   bar.SetProgress(-1);
   int progress = bar.GetProgress();
   EXPECT_EQ(0, progress);
@@ skipping 26 matching lines @@
   EXPECT_TRUE(bar.GetTooltipText(gfx::Point(), &tooltip));
   EXPECT_EQ(tooltip_text, tooltip);
 }
 
 TEST(ProgressBarTest, Accessibility) {
   ProgressBar bar;
   bar.SetProgress(62);
 
   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);
 
   EXPECT_TRUE(AccessibilityTypes::STATE_READONLY & bar.GetAccessibleState());
 }
 
 }  // namespace views