Revert 186627

content/browser/browser_plugin/browser_plugin_guest.cc

 // 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.
 
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 
 #include <algorithm>
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 427 matching lines @@
       break;
     default:
       break;
   }
 }
 
 // static
 void BrowserPluginGuest::AcknowledgeBufferPresent(
     int route_id,
     int gpu_host_id,
-    const gpu::Mailbox& mailbox_name,
+    const std::string& mailbox_name,
     uint32 sync_point) {
   AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
   ack_params.mailbox_name = mailbox_name;
   ack_params.sync_point = sync_point;
   RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id,
                                                  gpu_host_id,
                                                  ack_params);
 }
 
 // static
@@ skipping 248 matching lines @@
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 void BrowserPluginGuest::OnSwapBuffersACK(int instance_id,
                                           int route_id,
                                           int gpu_host_id,
-                                          const gpu::Mailbox& mailbox_name,
+                                          const std::string& mailbox_name,
                                           uint32 sync_point) {
   AcknowledgeBufferPresent(route_id, gpu_host_id, mailbox_name, sync_point);
 
 // This is only relevant on MACOSX and WIN when threaded compositing
 // is not enabled. In threaded mode, above ACK is sufficient.
 #if defined(OS_MACOSX) || defined(OS_WIN)
   RenderWidgetHostImpl* render_widget_host =
         RenderWidgetHostImpl::From(GetWebContents()->GetRenderViewHost());
   render_widget_host->AcknowledgeSwapBuffersToRenderer();
 #endif  // defined(OS_MACOSX) || defined(OS_WIN)
@@ skipping 206 matching lines @@
     // permission this way.
     embedder_web_contents_->RequestMediaAccessPermission(request, callback);
   } else {
     // Deny the request.
     callback.Run(content::MediaStreamDevices());
   }
   media_requests_map_.erase(media_request_iter);
 }
 
 }  // namespace content