Hook up ui::Compositor to Display's BeginFrameSource

cc/test/layer_tree_pixel_test.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/layer_tree_pixel_test.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/command_line.h"
-#include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "cc/base/switches.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/texture_layer.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
 #include "cc/output/direct_renderer.h"
 #include "cc/resources/texture_mailbox.h"
 #include "cc/test/paths.h"
 #include "cc/test/pixel_comparator.h"
@@ skipping 20 matching lines @@
 std::unique_ptr<OutputSurface> LayerTreePixelTest::CreateOutputSurface() {
   gfx::Size surface_expansion_size(40, 60);
   std::unique_ptr<PixelTestOutputSurface> output_surface;
 
   switch (test_type_) {
     case PIXEL_TEST_SOFTWARE: {
       std::unique_ptr<PixelTestSoftwareOutputDevice> software_output_device(
           new PixelTestSoftwareOutputDevice);
       software_output_device->set_surface_expansion_size(
           surface_expansion_size);
-      output_surface = base::WrapUnique(
-          new PixelTestOutputSurface(std::move(software_output_device)));
+      output_surface = base::WrapUnique(new PixelTestOutputSurface(
+          std::move(software_output_device), nullptr));
       break;
     }
     case PIXEL_TEST_GL: {
       bool flipped_output_surface = false;
       scoped_refptr<TestInProcessContextProvider> compositor(
           new TestInProcessContextProvider(nullptr));
       scoped_refptr<TestInProcessContextProvider> worker(
           new TestInProcessContextProvider(compositor.get()));
-      output_surface = base::WrapUnique(new PixelTestOutputSurface(
-          std::move(compositor), std::move(worker), flipped_output_surface));
+      output_surface = base::WrapUnique(
+          new PixelTestOutputSurface(std::move(compositor), std::move(worker),
+                                     flipped_output_surface, nullptr));
       break;
     }
   }
 
   output_surface->set_surface_expansion_size(surface_expansion_size);
   return std::move(output_surface);
 }
 
 void LayerTreePixelTest::WillCommitCompleteOnThread(LayerTreeHostImpl* impl) {
   if (impl->sync_tree()->source_frame_number() != 0)
@@ skipping 202 matching lines @@
 }
 
 void LayerTreePixelTest::Finish() {
   std::unique_ptr<gpu::GLInProcessContext> context =
       CreateTestInProcessContext();
   GLES2Interface* gl = context->GetImplementation();
   gl->Finish();
 }
 
 }  // namespace cc