Mus+Ash: Replace (Server)WindowSurface with (Server)WindowCompositorFrameSink

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,
+      window->GetOrCreateCompositorFrameSinkManager();
+  surface_manager->CreateCompositorFrameSink(
+      mojom::CompositorFrameSinkType::DEFAULT,
       mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink>(),
       cc::mojom::MojoCompositorFrameSinkClientPtr());
 }
 
 }  // namespace
 
 class FrameGeneratorTest : public testing::Test {
  public:
   FrameGeneratorTest() : display_compositor_(new DisplayCompositor(nullptr)) {}
   ~FrameGeneratorTest() override {}
@@ skipping 65 matching lines @@
   EXPECT_EQ(2u, quad_state_list->size());
   cc::SharedQuadState* root_sqs = quad_state_list->back();
   cc::SharedQuadState* child_sqs = quad_state_list->front();
   EXPECT_EQ(root_opacity, root_sqs->opacity);
   // Child's SharedQuadState contains the effective opacity of the child layer,
   // which should be a product of the child and the parent opacity.
   EXPECT_EQ(child_opacity * root_opacity, child_sqs->opacity);
 
   // Create the UNDERLAY Surface for the child window, and confirm that this
   // creates an extra SharedQuadState in the CompositorFrame.
-  child_window.GetOrCreateSurfaceManager()->CreateSurface(
-      mojom::SurfaceType::UNDERLAY,
-      mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink>(),
-      cc::mojom::MojoCompositorFrameSinkClientPtr());
+  child_window.GetOrCreateCompositorFrameSinkManager()
+      ->CreateCompositorFrameSink(
+          mojom::CompositorFrameSinkType::UNDERLAY,
+          cc::mojom::MojoCompositorFrameSinkRequest(),
+          cc::mojom::MojoCompositorFrameSinkClientPtr());
 
   render_pass = cc::RenderPass::Create();
   DrawWindowTree(render_pass.get());
   quad_state_list = &render_pass->shared_quad_state_list;
   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