Revert 186627

content/common/gpu/texture_image_transport_surface.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.
 
 #ifndef CONTENT_COMMON_GPU_TEXTURE_IMAGE_TRANSPORT_SURFACE_H_
 #define CONTENT_COMMON_GPU_TEXTURE_IMAGE_TRANSPORT_SURFACE_H_
 
 #include <string>
 
 #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"
 #include "ui/gl/gl_surface.h"
 
 namespace content {
 class GpuChannelManager;
 
 class TextureImageTransportSurface
     : public ImageTransportSurface,
@@ skipping 41 matching lines @@
     ~Texture();
 
     // The currently allocated size.
     gfx::Size size;
 
     // The actual GL texture id.
     uint32 service_id;
 
     // 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);
 
   // The framebuffer that represents this surface (service id). Allocated lazily
   // in OnMakeCurrent.
   uint32 fbo_id_;
 
   // The current backbuffer.
   Texture backbuffer_;
 
@@ skipping 25 matching lines @@
 
   // Holds a reference to the mailbox manager for cleanup.
   scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(TextureImageTransportSurface);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_TEXTURE_IMAGE_TRANSPORT_SURFACE_H_