Use explicit WebString conversions in remaining content files

content/child/webmessageportchannel_impl.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 "content/child/webmessageportchannel_impl.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 155 matching lines @@
 void WebMessagePortChannelImpl::postMessage(
     const WebString& message,
     WebMessagePortChannelArray* channels_ptr) {
   std::unique_ptr<WebMessagePortChannelArray> channels(channels_ptr);
   if (!main_thread_task_runner_->BelongsToCurrentThread()) {
     // Note: we must construct the base::string16 here and pass that. Otherwise,
     // the WebString will be passed, leading to references to the StringImpl
     // from two threads, which is a data race.
     main_thread_task_runner_->PostTask(
         FROM_HERE, base::Bind(&WebMessagePortChannelImpl::SendPostMessage, this,
-                              base::Passed(base::string16(message)),
+                              base::Passed(message.utf16()),
                               base::Passed(std::move(channels))));
   } else {
-    SendPostMessage(message, std::move(channels));
+    SendPostMessage(message.utf16(), std::move(channels));
   }
 }
 
 void WebMessagePortChannelImpl::SendPostMessage(
     const base::string16& message,
     std::unique_ptr<WebMessagePortChannelArray> channels) {
   IPC::Message* msg = new MessagePortHostMsg_PostMessage(
       message_port_id_, message, ExtractMessagePortIDs(std::move(channels)));
   Send(msg);
 }
 
 bool WebMessagePortChannelImpl::tryGetMessage(
     WebString* message,
     WebMessagePortChannelArray& channels) {
   base::AutoLock auto_lock(lock_);
   if (message_queue_.empty())
     return false;
 
-  *message = message_queue_.front().message;
+  *message = WebString::fromUTF16(message_queue_.front().message);
   channels = message_queue_.front().ports;
   message_queue_.pop();
   return true;
 }
 
 void WebMessagePortChannelImpl::Init() {
   if (!main_thread_task_runner_->BelongsToCurrentThread()) {
     main_thread_task_runner_->PostTask(
         FROM_HERE, base::Bind(&WebMessagePortChannelImpl::Init, this));
     return;
@@ skipping 107 matching lines @@
   ChildProcess::current()->ReleaseProcess();
 }
 
 WebMessagePortChannelImpl::Message::Message() {}
 
 WebMessagePortChannelImpl::Message::Message(const Message& other) = default;
 
 WebMessagePortChannelImpl::Message::~Message() {}
 
 }  // namespace content