Revert 186627

content/browser/browser_plugin/browser_plugin_guest.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.
 
 // A BrowserPluginGuest is the browser side of a browser <--> embedder
 // renderer channel. A BrowserPlugin (a WebPlugin) is on the embedder
 // renderer side of browser <--> embedder renderer communication.
 //
 // BrowserPluginGuest lives on the UI thread of the browser process. It has a
 // helper, BrowserPluginGuestHelper, which is a RenderViewHostObserver. The
@@ skipping 32 matching lines @@
 struct BrowserPluginHostMsg_CreateGuest_Params;
 struct BrowserPluginHostMsg_ResizeGuest_Params;
 struct ViewHostMsg_CreateWindow_Params;
 #if defined(OS_MACOSX)
 struct ViewHostMsg_ShowPopup_Params;
 #endif
 struct ViewHostMsg_UpdateRect_Params;
 class WebCursor;
 struct WebDropData;
 
-namespace gpu {
-struct Mailbox;
-}
-
 namespace WebKit {
 class WebInputEvent;
 }
 
 namespace content {
 
 class BrowserPluginHostFactory;
 class BrowserPluginEmbedder;
 class BrowserPluginGuestManager;
 class RenderProcessHost;
@@ skipping 111 matching lines @@
   virtual void SendMessageToEmbedder(IPC::Message* msg);
 
   // Returns the identifier that uniquely identifies a browser plugin guest
   // within an embedder.
   int instance_id() const { return instance_id_; }
 
   // Allow the embedder to call this for unhandled messages when
   // BrowserPluginGuest is already destroyed.
   static void AcknowledgeBufferPresent(int route_id,
                                        int gpu_host_id,
-                                       const gpu::Mailbox& mailbox_name,
+                                       const std::string& mailbox_name,
                                        uint32 sync_point);
 
   // Returns whether BrowserPluginGuest is interested in receiving the given
   // |message|.
   static bool ShouldForwardToBrowserPluginGuest(const IPC::Message& message);
 
  private:
   typedef std::pair<content::MediaStreamRequest, content::MediaResponseCallback>
       MediaStreamRequestAndCallbackPair;
   typedef std::map<int, MediaStreamRequestAndCallbackPair>
@@ skipping 90 matching lines @@
   // Additionally, it will slow down Javascript execution and garbage
   // collection. See RenderThreadImpl::IdleHandler (executed when hidden) and
   // RenderThreadImpl::IdleHandlerInForegroundTab (executed when visible).
   void OnSetVisibility(int instance_id, bool visible);
   // Stop loading the guest. Overriden in tests.
   virtual void OnStop(int instance_id);
   // Message from embedder acknowledging last HW buffer.
   void OnSwapBuffersACK(int instance_id,
                         int route_id,
                         int gpu_host_id,
-                        const gpu::Mailbox& mailbox_name,
+                        const std::string& mailbox_name,
                         uint32 sync_point);
 
   void OnTerminateGuest(int instance_id);
   void OnUnlockMouse();
   void OnUnlockMouseAck(int instance_id);
   void OnUpdateRectACK(
       int instance_id,
       const BrowserPluginHostMsg_AutoSize_Params& auto_size_params,
       const BrowserPluginHostMsg_ResizeGuest_Params& resize_guest_params);
 
@@ skipping 60 matching lines @@
   // if we allow or disallow the request. The key of the map is unique only for
   // a given BrowserPluginGuest.
   MediaStreamRequestsMap media_requests_map_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginGuest);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_GUEST_H_