Revert 186627

content/browser/browser_plugin/browser_plugin_guest_manager.h

 // Copyright 2013 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 BrowserPluginGuestManager serves as a message router to BrowserPluginGuests
 // for all guests within a given profile.
 // Messages are routed to a particular guest instance based on an instance_id.
 
 #ifndef CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_GUEST_MANAGER_H_
 #define CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_GUEST_MANAGER_H_
 
 #include "base/basictypes.h"
 #include "base/supports_user_data.h"
 #include "content/common/content_export.h"
 #include "ipc/ipc_message.h"
 
 struct BrowserPluginHostMsg_CreateGuest_Params;
 struct BrowserPluginHostMsg_ResizeGuest_Params;
 class GURL;
 
 namespace gfx {
 class Point;
 }
 
-namespace gpu {
-struct Mailbox;
-}
-
 namespace IPC {
 class Message;
 }  // namespace IPC
 
 namespace content {
 
 class BrowserPluginGuest;
 class BrowserPluginHostFactory;
 class RenderProcessHostImpl;
 class SiteInstance;
@@ skipping 50 matching lines @@
                                      BrowserPluginGuest* guest);
 
   // Returns an existing SiteInstance if the current profile has a guest of the
   // given |guest_site|.
   SiteInstance* GetGuestSiteInstance(const GURL& guest_site);
 
   // Message handlers.
   void OnUnhandledSwapBuffersACK(int instance_id,
                                  int route_id,
                                  int gpu_host_id,
-                                 const gpu::Mailbox& mailbox_name,
+                                 const std::string& mailbox_name,
                                  uint32 sync_point);
 
   // Static factory instance (always NULL outside of tests).
   static BrowserPluginHostFactory* factory_;
 
   // Contains guests' WebContents, mapping from their instance ids.
   typedef std::map<int, WebContentsImpl*> GuestInstanceMap;
   GuestInstanceMap guest_web_contents_by_instance_id_;
   int next_instance_id_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginGuestManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_GUEST_MANAGER_H_