Cleanup: Remove wstring methods from base::Pickle.

ipc/ipc_channel_unittest.cc

 // Copyright (c) 2012 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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/pickle.h"
+#include "base/strings/string16.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_test_base.h"
 #include "ipc/ipc_test_channel_listener.h"
 
 namespace {
 
 class IPCChannelTest : public IPCTestBase {
 };
 
 // TODO(viettrungluu): Move to a separate IPCMessageTest.
 TEST_F(IPCChannelTest, BasicMessageTest) {
   int v1 = 10;
   std::string v2("foobar");
-  std::wstring v3(L"hello world");
+  base::string16 v3(base::ASCIIToUTF16("hello world"));
 
   IPC::Message m(0, 1, IPC::Message::PRIORITY_NORMAL);
   EXPECT_TRUE(m.WriteInt(v1));
   EXPECT_TRUE(m.WriteString(v2));
-  EXPECT_TRUE(m.WriteWString(v3));
+  EXPECT_TRUE(m.WriteString16(v3));
 
   PickleIterator iter(m);
 
   int vi;
   std::string vs;
-  std::wstring vw;
+  base::string16 vs16;
 
   EXPECT_TRUE(iter.ReadInt(&vi));
   EXPECT_EQ(v1, vi);
 
   EXPECT_TRUE(iter.ReadString(&vs));
   EXPECT_EQ(v2, vs);
 
-  EXPECT_TRUE(iter.ReadWString(&vw));
-  EXPECT_EQ(v3, vw);
+  EXPECT_TRUE(iter.ReadString16(&vs16));
+  EXPECT_EQ(v3, vs16);
 
   // should fail
   EXPECT_FALSE(iter.ReadInt(&vi));
   EXPECT_FALSE(iter.ReadString(&vs));
-  EXPECT_FALSE(iter.ReadWString(&vw));
+  EXPECT_FALSE(iter.ReadString16(&vs16));
 }
 
 TEST_F(IPCChannelTest, ChannelTest) {
   Init("GenericClient");
 
   // Set up IPC channel and start client.
   IPC::TestChannelListener listener;
   CreateChannel(&listener);
   listener.Init(sender());
   ASSERT_TRUE(ConnectChannel());
@@ skipping 128 matching lines @@
       &listener));
   CHECK(channel->Connect());
   listener.Init(channel.get());
   IPC::TestChannelListener::SendOneMessage(channel.get(), "hello from child");
 
   base::MessageLoop::current()->Run();
   return 0;
 }
 
 }  // namespace