Revert 251207 "Use gpu::Mailbox instead of std:string in IPCs"

Speculative revert to determine whether it is causing the below
WebViewTest.AutoSizeSW failure on the Linux Test bots (e.g.,
http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%281%29/builds/30888/steps/browser_tests/logs/AutoSizeSW):

FATAL:texture_layer.cc(141)] Check failed: !mailbox.IsValid() || !holder_ref_
|| !mailbox.Equals(holder_ref_->holder()->mailbox()).

This failure also appeared on the trybot run for this CL.

> Use gpu::Mailbox instead of std:string in IPCs
> 
> - easier to read
> - safer since gpu::Mailbox is constant size and checked in the ParamTraits
> 
> BUG=None
> 
> Review URL: https://codereview.chromium.org/148003006

TBR=piman@chromium.org

Review URL: https://codereview.chromium.org/163433008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251281 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 3 deletions

diff --git a/content/renderer/child_frame_compositing_helper.cc b/content/renderer/child_frame_compositing_helper.cc
index cc3bc50..15cf383 100644
--- a/content/renderer/child_frame_compositing_helper.cc
+++ b/content/renderer/child_frame_compositing_helper.cc
@@ -246,10 +246,12 @@ void ChildFrameCompositingHelper::MailboxReleased(SwapBuffersInfo mailbox,
   ack_pending_ = false;
   switch (mailbox.type) {
     case TEXTURE_IMAGE_TRANSPORT: {
+      std::string mailbox_name(reinterpret_cast<const char*>(mailbox.name.name),
+                               sizeof(mailbox.name.name));
       FrameHostMsg_BuffersSwappedACK_Params params;
       params.gpu_host_id = mailbox.host_id;
       params.gpu_route_id = mailbox.route_id;
-      params.mailbox = mailbox.name;
+      params.mailbox_name = mailbox_name;
       params.sync_point = sync_point;
       SendBuffersSwappedACKToBrowser(params);
       break;
@@ -376,12 +378,12 @@ void ChildFrameCompositingHelper::OnBuffersSwappedPrivate(
 
 void ChildFrameCompositingHelper::OnBuffersSwapped(
     const gfx::Size& size,
-    const gpu::Mailbox& mailbox,
+    const std::string& mailbox_name,
     int gpu_route_id,
     int gpu_host_id,
     float device_scale_factor) {
   SwapBuffersInfo swap_info;
-  swap_info.name = mailbox;
+  swap_info.name.SetName(reinterpret_cast<const int8*>(mailbox_name.data()));
   swap_info.type = TEXTURE_IMAGE_TRANSPORT;
   swap_info.size = size;
   swap_info.route_id = gpu_route_id;