aura: Remove old GL paths from RenderWidgetHostViewAura.

content/renderer/gpu/compositor_output_surface.h

Index: content/renderer/gpu/compositor_output_surface.h
diff --git a/content/renderer/gpu/compositor_output_surface.h b/content/renderer/gpu/compositor_output_surface.h
index 7afaa519bb8c19f168a60bc20b91d0e233a601f0..527d0c287990a4c2c629163d17571acdebc5e826 100644
--- a/content/renderer/gpu/compositor_output_surface.h
+++ b/content/renderer/gpu/compositor_output_surface.h
@@ -62,6 +62,8 @@ class CompositorOutputSurface
   virtual void UpdateSmoothnessTakesPriority(bool prefer_smoothness) OVERRIDE;
 
  protected:
+  void ShortcutSwapAck(int output_surface_id,
+                       scoped_ptr<cc::CompositorFrameAck> ack);
   virtual void OnSwapAck(uint32 output_surface_id,
                          const cc::CompositorFrameAck& ack);
   virtual void OnReclaimResources(uint32 output_surface_id,
@@ -104,6 +106,8 @@ class CompositorOutputSurface
   scoped_refptr<IPC::SyncMessageFilter> message_sender_;
   int routing_id_;
   bool prefers_smoothness_;
+  // TODO(danakj): Remove this when crbug.com/311404
+  bool layout_test_mode_;
   base::PlatformThreadHandle main_thread_handle_;
 };