Revert 186627

content/common/gpu/texture_image_transport_surface.h

Index: content/common/gpu/texture_image_transport_surface.h
===================================================================
--- content/common/gpu/texture_image_transport_surface.h	(revision 186756)
+++ content/common/gpu/texture_image_transport_surface.h	(working copy)
@@ -10,7 +10,6 @@
 #include "base/basictypes.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "content/common/gpu/image_transport_surface.h"
-#include "gpu/command_buffer/common/mailbox.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "ui/gl/gl_context.h"
@@ -72,14 +71,14 @@
 
     // The mailbox name for the current service_id. Needs to be unique per
     // GL texture and is invalid while service_id is zero.
-    gpu::Mailbox mailbox_name;
+    gpu::gles2::MailboxName mailbox_name;
   };
 
   virtual ~TextureImageTransportSurface();
   void CreateBackTexture();
   void AttachBackTextureToFBO();
   void ReleaseBackTexture();
-  void BufferPresentedImpl(const gpu::Mailbox& mailbox_name);
+  void BufferPresentedImpl(const std::string& mailbox_name);
   void ProduceTexture(Texture* texture);
   void ConsumeTexture(Texture* texture);