Remove GLFrameData from CompositorFrame.

cc/test/pixel_test_output_surface.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/test/pixel_test_output_surface.h"
 
 #include <utility>
 
-#include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface_client.h"
+#include "cc/output/output_surface_frame.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
 
 PixelTestOutputSurface::PixelTestOutputSurface(
     scoped_refptr<ContextProvider> context_provider,
     bool flipped_output_surface)
     : OutputSurface(std::move(context_provider)),
@@ skipping 24 matching lines @@
                           size.height() + surface_expansion_size_.height());
   OutputSurface::Reshape(expanded_size, scale_factor, color_space, has_alpha);
 }
 
 bool PixelTestOutputSurface::HasExternalStencilTest() const {
   return external_stencil_test_;
 }
 
 void PixelTestOutputSurface::ApplyExternalStencil() {}
 
-void PixelTestOutputSurface::SwapBuffers(CompositorFrame frame) {
+void PixelTestOutputSurface::SwapBuffers(OutputSurfaceFrame frame) {
   PostSwapBuffersComplete();
 }
 
 OverlayCandidateValidator*
 PixelTestOutputSurface::GetOverlayCandidateValidator() const {
   return nullptr;
 }
 
 bool PixelTestOutputSurface::IsDisplayedAsOverlayPlane() const {
   return false;
 }
 
 unsigned PixelTestOutputSurface::GetOverlayTextureId() const {
   return 0;
 }
 
 bool PixelTestOutputSurface::SurfaceIsSuspendForRecycle() const {
   return false;
 }
 
 uint32_t PixelTestOutputSurface::GetFramebufferCopyTextureFormat() {
   // This format will work if the |context_provider| has an RGB or RGBA
   // framebuffer. For now assume tests do not want/care about alpha in
   // the root render pass.
   return GL_RGB;
 }
 
 }  // namespace cc