services/ui: Match naming in cc (and jellyfish branch)

services/ui/ws/server_window_surface_manager.cc

 // Copyright 2015 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/server_window_surface_manager.h"
 
-#include "services/ui/surfaces/surfaces_state.h"
+#include "services/ui/surfaces/display_compositor.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/server_window_delegate.h"
 #include "services/ui/ws/server_window_surface.h"
 
 namespace ui {
 namespace ws {
 
 ServerWindowSurfaceManager::ServerWindowSurfaceManager(ServerWindow* window)
     : window_(window),
       waiting_for_initial_frames_(
@@ skipping 43 matching lines @@
 bool ServerWindowSurfaceManager::HasSurfaceOfType(
     mojom::SurfaceType type) const {
   return type_to_surface_map_.count(type) > 0;
 }
 
 bool ServerWindowSurfaceManager::HasAnySurface() const {
   return GetDefaultSurface() || GetUnderlaySurface();
 }
 
 cc::SurfaceManager* ServerWindowSurfaceManager::GetSurfaceManager() {
-  return window()->delegate()->GetSurfacesState()->manager();
+  return window()->delegate()->GetDisplayCompositor()->manager();
 }
 
 bool ServerWindowSurfaceManager::IsSurfaceReadyAndNonEmpty(
     mojom::SurfaceType type) const {
   auto iter = type_to_surface_map_.find(type);
   if (iter == type_to_surface_map_.end())
     return false;
   if (iter->second->last_submitted_frame_size().IsEmpty())
     return false;
   const gfx::Size& last_submitted_frame_size =
       iter->second->last_submitted_frame_size();
   return last_submitted_frame_size.width() >= window_->bounds().width() &&
          last_submitted_frame_size.height() >= window_->bounds().height();
 }
 
 }  // namespace ws
 }  // namespace ui