Revert 171569 as it broke some browser_tests on win_aura.

content/browser/gpu/gpu_process_host_ui_shim.cc

Index: content/browser/gpu/gpu_process_host_ui_shim.cc
===================================================================
--- content/browser/gpu/gpu_process_host_ui_shim.cc	(revision 171661)
+++ content/browser/gpu/gpu_process_host_ui_shim.cc	(working copy)
@@ -31,11 +31,6 @@
 #include <gdk/gdkx.h>  // NOLINT
 #endif
 
-// From gl2/gl2ext.h.
-#ifndef GL_MAILBOX_SIZE_CHROMIUM
-#define GL_MAILBOX_SIZE_CHROMIUM 64
-#endif
-
 namespace content {
 
 namespace {
@@ -307,14 +302,8 @@
       params.surface_id);
   if (!view)
     return;
-
-  if (params.mailbox_name.length() &&
-      params.mailbox_name.length() != GL_MAILBOX_SIZE_CHROMIUM)
-    return;
-
   view->AcceleratedSurfaceNew(
-      params.width, params.height, params.surface_handle,
-      params.mailbox_name);
+      params.width, params.height, params.surface_handle);
 }
 
 static base::TimeDelta GetSwapDelay() {
@@ -334,9 +323,7 @@
 
   ScopedSendOnIOThread delayed_send(
       host_id_,
-      new AcceleratedSurfaceMsg_BufferPresented(params.route_id,
-                                                params.surface_handle,
-                                                0));
+      new AcceleratedSurfaceMsg_BufferPresented(params.route_id, false, 0));
 
   RenderWidgetHostViewPort* view = GetRenderWidgetHostViewFromSurfaceID(
       params.surface_id);
@@ -360,9 +347,7 @@
 
   ScopedSendOnIOThread delayed_send(
       host_id_,
-      new AcceleratedSurfaceMsg_BufferPresented(params.route_id,
-                                                params.surface_handle,
-                                                0));
+      new AcceleratedSurfaceMsg_BufferPresented(params.route_id, false, 0));
 
   RenderWidgetHostViewPort* view =
       GetRenderWidgetHostViewFromSurfaceID(params.surface_id);
@@ -393,7 +378,7 @@
       params.surface_id);
   if (!view)
     return;
-  view->AcceleratedSurfaceRelease();
+  view->AcceleratedSurfaceRelease(params.identifier);
 }
 
 void GpuProcessHostUIShim::OnVideoMemoryUsageStatsReceived(