Revert of aura: Remove old GL paths from RenderWidgetHostViewAura.

content/renderer/gpu/compositor_output_surface.cc

Index: content/renderer/gpu/compositor_output_surface.cc
diff --git a/content/renderer/gpu/compositor_output_surface.cc b/content/renderer/gpu/compositor_output_surface.cc
index b1b933d9ad0de8911da57e2667161d19b339b88f..1ddafda0491764d4981b0189f2eba9abd516c88e 100644
--- a/content/renderer/gpu/compositor_output_surface.cc
+++ b/content/renderer/gpu/compositor_output_surface.cc
@@ -63,12 +63,11 @@
       prefers_smoothness_(false),
 #if defined(OS_WIN)
       // TODO(epenner): Implement PlatformThread::CurrentHandle() on windows.
-      main_thread_handle_(base::PlatformThreadHandle()),
+      main_thread_handle_(base::PlatformThreadHandle())
 #else
-      main_thread_handle_(base::PlatformThread::CurrentHandle()),
-#endif
-      layout_test_mode_(RenderThreadImpl::current()->layout_test_mode()),
-      weak_ptrs_(this) {
+      main_thread_handle_(base::PlatformThread::CurrentHandle())
+#endif
+{
   DCHECK(output_surface_filter_.get());
   DetachFromThread();
   message_sender_ = RenderThreadImpl::current()->sync_message_filter();
@@ -112,46 +111,7 @@
   return true;
 }
 
-void CompositorOutputSurface::ShortcutSwapAck(
-    uint32 output_surface_id,
-    scoped_ptr<cc::GLFrameData> gl_frame_data,
-    scoped_ptr<cc::SoftwareFrameData> software_frame_data) {
-  if (!layout_test_previous_frame_ack_) {
-    layout_test_previous_frame_ack_.reset(new cc::CompositorFrameAck);
-    layout_test_previous_frame_ack_->gl_frame_data.reset(new cc::GLFrameData);
-  }
-
-  OnSwapAck(output_surface_id, *layout_test_previous_frame_ack_);
-
-  layout_test_previous_frame_ack_->gl_frame_data = gl_frame_data.Pass();
-  layout_test_previous_frame_ack_->last_software_frame_id =
-      software_frame_data ? software_frame_data->id : 0;
-}
-
 void CompositorOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
-  if (layout_test_mode_ && use_swap_compositor_frame_message_) {
-    // This code path is here to support layout tests that are currently
-    // doing a readback in the renderer instead of the browser. So they
-    // are using deprecated code paths in the renderer and don't need to
-    // actually swap anything to the browser. We shortcut the swap to the
-    // browser here and just ack directly within the renderer process.
-    // Once crbug.com/311404 is fixed, this can be removed.
-
-    // This would indicate that crbug.com/311404 is being fixed, and this
-    // block needs to be removed.
-    DCHECK(!frame->delegated_frame_data);
-
-    base::MessageLoopProxy::current()->PostTask(
-        FROM_HERE,
-        base::Bind(&CompositorOutputSurface::ShortcutSwapAck,
-                   weak_ptrs_.GetWeakPtr(),
-                   output_surface_id_,
-                   base::Passed(&frame->gl_frame_data),
-                   base::Passed(&frame->software_frame_data)));
-    DidSwapBuffers();
-    return;
-  }
-
   if (use_swap_compositor_frame_message_) {
     Send(new ViewHostMsg_SwapCompositorFrame(routing_id_,
                                              output_surface_id_,