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

services/ui/ws/window_server.cc

 // Copyright 2014 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/window_server.h"
 
 #include <set>
 #include <string>
 
 #include "base/logging.h"
@@ skipping 786 matching lines @@
   const std::set<Display*>& displays = display_manager()->displays();
   for (auto* display : displays)
     display->platform_display()->OnGpuChannelEstablished(gpu_channel_);
 }
 
 void WindowServer::OnSurfaceCreated(const cc::SurfaceId& surface_id,
                                     const gfx::Size& frame_size,
                                     float device_scale_factor) {
   WindowId window_id(
       WindowIdFromTransportId(surface_id.frame_sink_id().client_id()));
-  mojom::SurfaceType surface_type(
-      static_cast<mojom::SurfaceType>(surface_id.frame_sink_id().sink_id()));
+  mojom::CompositorFrameSinkType surface_type(
+      static_cast<mojom::CompositorFrameSinkType>(
+          surface_id.frame_sink_id().sink_id()));
   // We only care about propagating default surface IDs.
   // TODO(fsamuel, sadrul): we should get rid of surface types.
-  if (surface_type != mojom::SurfaceType::DEFAULT)
+  if (surface_type != mojom::CompositorFrameSinkType::DEFAULT)
     return;
   ServerWindow* window = GetWindow(window_id);
   // If the window doesn't have a parent then we have nothing to propagate.
   if (!window || !window->parent())
     return;
   WindowTree* window_tree = GetTreeWithId(window->parent()->id().client_id);
   if (window_tree) {
     window_tree->ProcessWindowSurfaceChanged(window, surface_id, frame_size,
                                              device_scale_factor);
   }
@@ skipping 13 matching lines @@
 void WindowServer::OnUserIdAdded(const UserId& id) {
   activity_monitor_map_[id] = base::MakeUnique<UserActivityMonitor>(nullptr);
 }
 
 void WindowServer::OnUserIdRemoved(const UserId& id) {
   activity_monitor_map_.erase(id);
 }
 
 }  // namespace ws
 }  // namespace ui