Revert 186627

content/renderer/browser_plugin/browser_plugin.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/renderer/browser_plugin/browser_plugin.h"
 
 #include "base/command_line.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
@@ skipping 393 matching lines @@
   navigate_src_sent_ = true;
 }
 
 void BrowserPlugin::OnAdvanceFocus(int instance_id, bool reverse) {
   DCHECK(render_view_);
   render_view_->GetWebView()->advanceFocus(reverse);
 }
 
 void BrowserPlugin::OnBuffersSwapped(int instance_id,
                                      const gfx::Size& size,
-                                     gpu::Mailbox mailbox_name,
+                                     std::string mailbox_name,
                                      int gpu_route_id,
                                      int gpu_host_id) {
   DCHECK(instance_id == instance_id_);
   EnableCompositing(true);
 
   compositing_helper_->OnBuffersSwapped(size,
                                         mailbox_name,
                                         gpu_route_id,
                                         gpu_host_id,
                                         GetDeviceScaleFactor());
@@ skipping 977 matching lines @@
     const WebKit::WebMouseEvent& event) {
   browser_plugin_manager()->Send(
       new BrowserPluginHostMsg_HandleInputEvent(render_view_routing_id_,
                                                 instance_id_,
                                                 plugin_rect_,
                                                 &event));
   return true;
 }
 
 }  // namespace content