views: Change the remaining std::wstring entries to string16.

views/view_unittest.cc

Index: views/view_unittest.cc
diff --git a/views/view_unittest.cc b/views/view_unittest.cc
index ba6579d530472262bf69f4814b120b5b7074ec59..d702e95af703de5b92dcbeb4603e24a61ef8cfc0 100644
--- a/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -850,9 +850,9 @@ TEST_F(ViewTest, Textfield) {
 
 // Tests that the Textfield view respond appropiately to cut/copy/paste.
 TEST_F(ViewTest, TextfieldCutCopyPaste) {
-  const std::wstring kNormalText = L"Normal";
-  const std::wstring kReadOnlyText = L"Read only";
-  const std::wstring kPasswordText = L"Password! ** Secret stuff **";
+  const string16 kNormalText = ASCIIToUTF16("Normal");
+  const string16 kReadOnlyText = ASCIIToUTF16("Read only");
+  const string16 kPasswordText = ASCIIToUTF16("Password! ** Secret stuff **");
 
   ui::Clipboard clipboard;
 
@@ -941,12 +941,12 @@ TEST_F(ViewTest, TextfieldCutCopyPaste) {
   ::SendMessage(read_only->GetTestingHandle(), WM_KEYDOWN, 0, 0);
   wchar_t buffer[1024] = { 0 };
   ::GetWindowText(read_only->GetTestingHandle(), buffer, 1024);
-  EXPECT_EQ(kReadOnlyText, std::wstring(buffer));
+  EXPECT_EQ(kReadOnlyText, string16(buffer));

[sky, 2011/10/24 14:56:08]

I believe these should rename wstring since buffer is wchar

[tfarina, 2011/10/24 15:19:42]

On Windows string16 is typedefed to std::wstring.

 
   password->SelectAll();
   ::SendMessage(password->GetTestingHandle(), WM_PASTE, 0, 0);
   ::GetWindowText(password->GetTestingHandle(), buffer, 1024);
-  EXPECT_EQ(kNormalText, std::wstring(buffer));
+  EXPECT_EQ(kNormalText, string16(buffer));
 
   // Copy from read_only so the string we are pasting is not the same as the
   // current one.
@@ -955,7 +955,7 @@ TEST_F(ViewTest, TextfieldCutCopyPaste) {
   normal->SelectAll();
   ::SendMessage(normal->GetTestingHandle(), WM_PASTE, 0, 0);
   ::GetWindowText(normal->GetTestingHandle(), buffer, 1024);
-  EXPECT_EQ(kReadOnlyText, std::wstring(buffer));
+  EXPECT_EQ(kReadOnlyText, string16(buffer));
   widget->CloseNow();
 }
 #endif