Mus: Remove dependency on ServerWindowCompositorFrameSink from FrameGenerator

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"
@@ skipping 56 matching lines @@
   TestServerWindowDelegate window_delegate_;
   std::unique_ptr<ServerWindow> root_window_;
 
   // 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);
+  frame_generator_->DrawWindowTree(
+      pass, frame_generator_delegate_->GetRootWindow(), gfx::Vector2d(), 1.0f);
 }
 
 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(), root_window_.get(), display_compositor_);
   InitWindow(root_window());
@@ skipping 44 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