Mus: Remove CompositorFrameSinkType

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/memory/ptr_util.h"
 #include "base/test/test_message_loop.h"
@@ skipping 14 matching lines @@
 
 // Typical id for the display root ServerWindow.
 constexpr WindowId kRootDisplayId(0, 2);
 const base::UnguessableToken kArbitraryToken = base::UnguessableToken::Create();
 
 // Makes the window visible and creates the default surface for it.
 void InitWindow(ServerWindow* window) {
   window->SetVisible(true);
   ServerWindowCompositorFrameSinkManager* compositor_frame_sink_manager =
       window->GetOrCreateCompositorFrameSinkManager();
-  compositor_frame_sink_manager->SetLatestSurfaceInfo(
-      mojom::CompositorFrameSinkType::DEFAULT,
-      cc::SurfaceInfo(
-          cc::SurfaceId(
-              cc::FrameSinkId(WindowIdToTransportId(window->id()),
-                              static_cast<uint32_t>(
-                                  mojom::CompositorFrameSinkType::DEFAULT)),
-              cc::LocalFrameId(1u, kArbitraryToken)),
-          1.0f, gfx::Size(100, 100)));
+  compositor_frame_sink_manager->SetLatestSurfaceInfo(cc::SurfaceInfo(
+      cc::SurfaceId(cc::FrameSinkId(WindowIdToTransportId(window->id()), 0),
+                    cc::LocalFrameId(1u, kArbitraryToken)),
+      1.0f, gfx::Size(100, 100)));
 }
 
 }  // namespace
 
 class FrameGeneratorTest : public testing::Test {
  public:
   FrameGeneratorTest()
       : root_window_(base::MakeUnique<ServerWindow>(&window_delegate_,
                                                     kRootDisplayId)) {}
   ~FrameGeneratorTest() override {}
@@ skipping 58 matching lines @@
 
   EXPECT_EQ(1u, quad_state_list->size());
   cc::SharedQuadState* root_sqs = quad_state_list->back();
   // Opacity should always be 1.
   EXPECT_EQ(1.0f, root_sqs->opacity);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui