Revert of 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 a1127c3e7efeb2c63fa680e3a7a069ba878bfc3e..62e159de9a1b98dddadd8e2a4202af9f22c4e21f 100644
--- a/content/renderer/gpu/compositor_output_surface.h
+++ b/content/renderer/gpu/compositor_output_surface.h
@@ -9,7 +9,6 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
@@ -29,8 +28,6 @@
 namespace cc {
 class CompositorFrame;
 class CompositorFrameAck;
-class GLFrameData;
-class SoftwareFrameData;
 }
 
 namespace content {
@@ -65,9 +62,6 @@
   virtual void UpdateSmoothnessTakesPriority(bool prefer_smoothness) OVERRIDE;
 
  protected:
-  void ShortcutSwapAck(uint32 output_surface_id,
-                       scoped_ptr<cc::GLFrameData> gl_frame_data,
-                       scoped_ptr<cc::SoftwareFrameData> software_frame_data);
   virtual void OnSwapAck(uint32 output_surface_id,
                          const cc::CompositorFrameAck& ack);
   virtual void OnReclaimResources(uint32 output_surface_id,
@@ -111,11 +105,6 @@
   int routing_id_;
   bool prefers_smoothness_;
   base::PlatformThreadHandle main_thread_handle_;
-
-  // TODO(danakj): Remove this when crbug.com/311404
-  bool layout_test_mode_;
-  scoped_ptr<cc::CompositorFrameAck> layout_test_previous_frame_ack_;
-  base::WeakPtrFactory<CompositorOutputSurface> weak_ptrs_;
 };
 
 }  // namespace content