Revert 186627

content/common/browser_plugin/browser_plugin_messages.h

 // 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.
 
 // Multiply-included message header, no traditional include guard.
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/process.h"
 #include "base/shared_memory.h"
 #include "base/values.h"
 #include "content/common/browser_plugin/browser_plugin_message_enums.h"
 #include "content/common/content_export.h"
 #include "content/common/content_param_traits.h"
 #include "content/public/common/common_param_traits.h"
-#include "gpu/command_buffer/common/mailbox.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragStatus.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webdropdata.h"
@@ skipping 173 matching lines @@
                     int /* instance_id*/,
                     std::string /* src */)
 
 // Acknowledge that we presented a HW buffer and provide a sync point
 // to specify the location in the command stream when the compositor
 // is no longer using it.
 IPC_MESSAGE_ROUTED5(BrowserPluginHostMsg_BuffersSwappedACK,
                     int /* instance_id */,
                     int /* route_id */,
                     int /* gpu_host_id */,
-                    gpu::Mailbox /* mailbox_name */,
+                    std::string /* mailbox_name */,
                     uint32 /* sync_point */)
 
 // When a BrowserPlugin has been removed from the embedder's DOM, it informs
 // the browser process to cleanup the guest.
 IPC_MESSAGE_ROUTED1(BrowserPluginHostMsg_PluginDestroyed,
                     int /* instance_id */)
 
 // Tells the guest it has been shown or hidden.
 IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_SetVisibility,
                     int /* instance_id */,
@@ skipping 156 matching lines @@
                      int /* instance_id */,
                      std::string /* name */)
 
 // Guest renders into an FBO with textures provided by the embedder.
 // When HW accelerated buffers are swapped in the guest, the message
 // is forwarded to the embedder to notify it of a new texture
 // available for compositing.
 IPC_MESSAGE_CONTROL5(BrowserPluginMsg_BuffersSwapped,
                      int /* instance_id */,
                      gfx::Size /* size */,
-                     gpu::Mailbox /* mailbox_name */,
+                     std::string /* mailbox_name */,
                      int /* route_id */,
                      int /* gpu_host_id */)
 
 // When the guest requests permission, the browser process forwards this
 // request to the embeddder through this message.
 IPC_MESSAGE_CONTROL4(BrowserPluginMsg_RequestPermission,
                      int /* instance_id */,
                      BrowserPluginPermissionType /* permission_type */,
                      int /* request_id */,
                      DictionaryValue /* request_info */)
 
 // Forwards a PointerLock Lock request to the BrowserPlugin.
 IPC_MESSAGE_ROUTED4(BrowserPluginMsg_LockMouse,
                     int /* instance_id */,
                     bool /* user_gesture */,
                     bool /* last_unlocked_by_target */,
                     bool /* privileged */)
 
 // Forwards a PointerLock Unlock request to the BrowserPlugin.
 IPC_MESSAGE_ROUTED1(BrowserPluginMsg_UnlockMouse, int /* instance_id */)