Remove GLFrameData from CompositorFrame.

cc/output/output_surface_unittest.cc

Index: cc/output/output_surface_unittest.cc
diff --git a/cc/output/output_surface_unittest.cc b/cc/output/output_surface_unittest.cc
index f53561bdc7098bfadf5cf92cbbecf643e013fb37..f589a25ff26c2f16e52431e13e27a16cde08eeb6 100644
--- a/cc/output/output_surface_unittest.cc
+++ b/cc/output/output_surface_unittest.cc
@@ -7,8 +7,7 @@
 #include <utility>
 
 #include "base/memory/ptr_util.h"
-#include "cc/output/compositor_frame.h"
-#include "cc/output/output_surface.h"
+#include "cc/output/output_surface_frame.h"
 #include "cc/output/software_output_device.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/test_context_provider.h"
@@ -32,7 +31,7 @@ class TestOutputSurface : public OutputSurface {
   void EnsureBackbuffer() override {}
   void DiscardBackbuffer() override {}
   void BindFramebuffer() override {}
-  void SwapBuffers(CompositorFrame frame) override {
+  void SwapBuffers(OutputSurfaceFrame frame) override {
     client_->DidSwapBuffersComplete();
   }
   uint32_t GetFramebufferCopyTextureFormat() override {