Mus+Ash: Fix the FrameSinkId of the FrameGenerator's CompositorFrameSink

services/ui/ws/frame_generator_unittest.cc

 // Copyright 2016 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 "services/ui/ws/frame_generator.h"
 
 #include <memory>
 
 #include "base/test/test_message_loop.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/shared_quad_state.h"
+#include "services/ui/surfaces/display_compositor.h"
 #include "services/ui/ws/platform_display_init_params.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/server_window_surface_manager.h"
 #include "services/ui/ws/test_server_window_delegate.h"
 #include "services/ui/ws/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ui {
 namespace ws {
 namespace test {
 namespace {
 
 // Makes the window visible and creates the default surface for it.
 void InitWindow(ServerWindow* window) {
   window->SetVisible(true);
   ServerWindowSurfaceManager* surface_manager =
       window->GetOrCreateSurfaceManager();
   surface_manager->CreateSurface(mojom::SurfaceType::DEFAULT,
                                  mojo::InterfaceRequest<mojom::Surface>(),
                                  mojom::SurfaceClientPtr());
 }
 
 }  // namespace
 
 class FrameGeneratorTest : public testing::Test {
  public:
-  FrameGeneratorTest() {}
+  FrameGeneratorTest() : display_compositor_(new DisplayCompositor()) {}
   ~FrameGeneratorTest() override {}
 
   // Calls DrawWindowTree() on |frame_generator_|
   void DrawWindowTree(cc::RenderPass* pass);
 
   ServerWindow* root_window() {
     return frame_generator_delegate_->GetRootWindow();
   }
 
   TestServerWindowDelegate* test_window_delegate() { return &window_delegate_; }
 
  private:
   // testing::Test:
   void SetUp() override;
   void TearDown() override;
 
+  scoped_refptr<DisplayCompositor> display_compositor_;
   std::unique_ptr<FrameGenerator> frame_generator_;
   std::unique_ptr<TestFrameGeneratorDelegate> frame_generator_delegate_;
   TestServerWindowDelegate window_delegate_;
 
   // Needed so that Mojo classes can be initialized for ServerWindow use.
   base::TestMessageLoop message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameGeneratorTest);
 };
 
 void FrameGeneratorTest::DrawWindowTree(cc::RenderPass* pass) {
   frame_generator_->DrawWindowTree(pass,
                                    frame_generator_delegate_->GetRootWindow(),
                                    gfx::Vector2d(), 1.0f, nullptr);
 }
 
 void FrameGeneratorTest::SetUp() {
   testing::Test::SetUp();
   frame_generator_delegate_ = base::MakeUnique<TestFrameGeneratorDelegate>(
       base::MakeUnique<ServerWindow>(&window_delegate_, WindowId()));
   PlatformDisplayInitParams init_params;
   frame_generator_ = base::MakeUnique<FrameGenerator>(
-      frame_generator_delegate_.get(), init_params.display_compositor);
+      frame_generator_delegate_.get(), display_compositor_);
   InitWindow(root_window());
 }
 
 void FrameGeneratorTest::TearDown() {
   frame_generator_.reset();
   frame_generator_delegate_.reset();
 }
 
 // Tests correctness of the SharedQuadStateList generated by
 // FrameGenerator::DrawWindowTree().
@@ skipping 33 matching lines @@
   EXPECT_EQ(3u, quad_state_list->size());
   auto it = quad_state_list->begin();
   EXPECT_EQ(child_opacity * root_opacity, (*it)->opacity);
   EXPECT_EQ(child_opacity * root_opacity, (*++it)->opacity);
   EXPECT_EQ(root_opacity, (*++it)->opacity);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui