Revert 186627

content/browser/renderer_host/render_widget_host_view_aura.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_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 26 matching lines @@
 
 namespace cc {
 class DelegatedFrameData;
 }
 
 namespace gfx {
 class Canvas;
 class Display;
 }
 
-namespace gpu {
-struct Mailbox;
-}
-
 namespace ui {
 class CompositorLock;
 class InputMethod;
 class Texture;
 }
 
 namespace content {
 class RenderWidgetHostImpl;
 class RenderWidgetHostView;
 
@@ skipping 296 matching lines @@
 
   // Converts |rect| from window coordinate to screen coordinate.
   gfx::Rect ConvertRectToScreen(const gfx::Rect& rect);
 
   typedef base::Callback<void(bool, const scoped_refptr<ui::Texture>&)>
       BufferPresentedCallback;
 
   // The common entry point for full buffer updates from renderer
   // and GPU process.
   void BuffersSwapped(const gfx::Size& size,
-                      const gpu::Mailbox& mailbox_name,
+                      const std::string& mailbox_name,
                       const BufferPresentedCallback& ack_callback);
 
   bool SwapBuffersPrepare(const gfx::Rect& surface_rect,
                           const gfx::Rect& damage_rect,
-                          const gpu::Mailbox& mailbox_name,
+                          const std::string& mailbox_name,
                           const BufferPresentedCallback& ack_callback);
 
   void SwapBuffersCompleted(
       const BufferPresentedCallback& ack_callback,
       const scoped_refptr<ui::Texture>& texture_to_return);
 
   void SwapDelegatedFrame(
       scoped_ptr<cc::DelegatedFrameData> frame,
       float device_scale_factor);
   void SendDelegatedFrameAck();
@@ skipping 157 matching lines @@
 #endif
 
   base::TimeTicks last_draw_ended_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_