Move display_ From CompositorFrameSinkSupport To GpuDisplayCompositorFrameSink

cc/surfaces/compositor_frame_sink_support_unittest.cc

 // Copyright 2017 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/surfaces/compositor_frame_sink_support.h"
 
 #include "base/macros.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/surfaces/compositor_frame_sink_support_client.h"
 #include "cc/surfaces/frame_sink_id.h"
 #include "cc/surfaces/surface_id.h"
+#include "cc/surfaces/surface_manager.h"
 #include "cc/test/begin_frame_args_test.h"
 #include "cc/test/fake_external_begin_frame_source.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::UnorderedElementsAre;
 using testing::IsEmpty;
 using testing::SizeIs;
 
 namespace cc {
@@ skipping 68 matching lines @@
   // testing::Test:
   void SetUp() override {
     testing::Test::SetUp();
     begin_frame_source_ =
         base::MakeUnique<FakeExternalBeginFrameSource>(0.f, false);
     std::unique_ptr<SurfaceDependencyTracker> dependency_tracker(
         new SurfaceDependencyTracker(&surface_manager_,
                                      begin_frame_source_.get()));
     surface_manager_.SetDependencyTracker(std::move(dependency_tracker));
     supports_.push_back(base::MakeUnique<CompositorFrameSinkSupport>(
-        this, &surface_manager_, kParentFrameSink, nullptr /* display */,
-        nullptr /* display_begin_frame_source */));
+        this, &surface_manager_, kParentFrameSink,
+        false /* submits_to_display_compositor */));
     supports_.push_back(base::MakeUnique<CompositorFrameSinkSupport>(
-        this, &surface_manager_, kChildFrameSink1, nullptr /* display */,
-        nullptr /* display_begin_frame_source */));
+        this, &surface_manager_, kChildFrameSink1,
+        false /* submits_to_display_compositor */));
     supports_.push_back(base::MakeUnique<CompositorFrameSinkSupport>(
-        this, &surface_manager_, kChildFrameSink2, nullptr /* display */,
-        nullptr /* display_begin_frame_source */));
+        this, &surface_manager_, kChildFrameSink2,
+        false /* submits_to_display_compositor */));
   }
 
   void TearDown() override {
     surface_manager_.SetDependencyTracker(nullptr);
 
     // SurfaceDependencyTracker depends on this BeginFrameSource and so it must
     // be destroyed AFTER the dependency tracker is destroyed.
     begin_frame_source_.reset();
 
     supports_.clear();
@@ skipping 320 matching lines @@
               UnorderedElementsAre(arbitrary_id));
   // Verify that the parent will add a reference to |arbitrary_id| and will not
   // remove a reference to |child_id|.
   EXPECT_THAT(parent_reference_tracker().references_to_add(),
               UnorderedElementsAre(parent_arbitrary_reference));
   EXPECT_THAT(parent_reference_tracker().references_to_remove(), IsEmpty());
 }
 
 }  // namespace test
 }  // namespace cc