Remove GLFrameData from CompositorFrame.

content/browser/compositor/software_browser_compositor_output_surface_unittest.cc

 // Copyright 2014 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 "content/browser/compositor/software_browser_compositor_output_surface.h"
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/test/test_message_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "cc/output/compositor_frame.h"
+#include "cc/output/output_surface_frame.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/scheduler/delay_based_time_source.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/gfx/vsync_provider.h"
 
 namespace {
 
@@ skipping 54 matching lines @@
  protected:
   std::unique_ptr<content::BrowserCompositorOutputSurface> output_surface_;
 
   // TODO(crbug.com/616973): We shouldn't be using ThreadTaskRunnerHandle::Get()
   // inside the OutputSurface, so we shouldn't need a MessageLoop. The
   // OutputSurface should be using the TaskRunner given to the compositor.
   base::TestMessageLoop message_loop_;
   cc::DelayBasedBeginFrameSource begin_frame_source_;
   std::unique_ptr<ui::Compositor> compositor_;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(SoftwareBrowserCompositorOutputSurfaceTest);
 };
 
 void SoftwareBrowserCompositorOutputSurfaceTest::SetUp() {
   bool enable_pixel_output = false;
   ui::ContextFactory* context_factory =
       ui::InitializeContextFactoryForTests(enable_pixel_output);
 
   compositor_.reset(
       new ui::Compositor(context_factory, message_loop_.task_runner().get()));
@@ skipping 13 matching lines @@
       std::move(device), compositor_->vsync_manager(), &begin_frame_source_);
 }
 
 TEST_F(SoftwareBrowserCompositorOutputSurfaceTest, NoVSyncProvider) {
   cc::FakeOutputSurfaceClient output_surface_client;
   std::unique_ptr<cc::SoftwareOutputDevice> software_device(
       new cc::SoftwareOutputDevice());
   output_surface_ = CreateSurface(std::move(software_device));
   CHECK(output_surface_->BindToClient(&output_surface_client));
 
-  cc::CompositorFrame frame;
-  output_surface_->SwapBuffers(std::move(frame));
+  output_surface_->SwapBuffers(cc::OutputSurfaceFrame());
   EXPECT_EQ(NULL, output_surface_->software_device()->GetVSyncProvider());
 }
 
 TEST_F(SoftwareBrowserCompositorOutputSurfaceTest, VSyncProviderUpdates) {
   cc::FakeOutputSurfaceClient output_surface_client;
   std::unique_ptr<cc::SoftwareOutputDevice> software_device(
       new FakeSoftwareOutputDevice());
   output_surface_ = CreateSurface(std::move(software_device));
   CHECK(output_surface_->BindToClient(&output_surface_client));
 
   FakeVSyncProvider* vsync_provider = static_cast<FakeVSyncProvider*>(
       output_surface_->software_device()->GetVSyncProvider());
   EXPECT_EQ(0, vsync_provider->call_count());
 
-  cc::CompositorFrame frame;
-  output_surface_->SwapBuffers(std::move(frame));
+  output_surface_->SwapBuffers(cc::OutputSurfaceFrame());
   EXPECT_EQ(1, vsync_provider->call_count());
 }