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

views/view_unittest.cc

 // Copyright (c) 2011 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 <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 832 matching lines @@
   textfield->ClearSelection();
   EXPECT_EQ(kEmptyString, textfield->GetSelectedText());
 
   widget->CloseNow();
 }
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 
 // 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;
 
   Widget* widget = new Widget;
   Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
   params.bounds = gfx::Rect(0, 0, 100, 100);
   widget->Init(params);
   View* root_view = widget->GetRootView();
 
   Textfield* normal = new Textfield();
@@ skipping 68 matching lines @@
   //
   // Note that we use GetWindowText instead of Textfield::GetText below as the
   // text in the Textfield class is synced to the text of the HWND on
   // WM_KEYDOWN messages that we are not simulating here.
 
   // Attempting to copy kNormalText in a read-only text-field should fail.
   read_only->SelectAll();
   ::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.
   read_only->SelectAll();
   ::SendMessage(read_only->GetTestingHandle(), WM_COPY, 0, 0);
   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
 
 ////////////////////////////////////////////////////////////////////////////////
 // Accelerators
 ////////////////////////////////////////////////////////////////////////////////
 bool TestView::AcceleratorPressed(const Accelerator& accelerator) {
   accelerator_count_map_[accelerator]++;
   return true;
@@ skipping 2092 matching lines @@
   ScrambleTree(content);
   EXPECT_TRUE(ViewAndLayerTreeAreConsistent(content, content->layer()));
 
   ScrambleTree(content);
   EXPECT_TRUE(ViewAndLayerTreeAreConsistent(content, content->layer()));
 }
 
 #endif  // VIEWS_COMPOSITOR
 
 }  // namespace views