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

services/ui/ws/display_manager.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/display_manager.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
 #include "services/ui/display/platform_screen.h"
 #include "services/ui/ws/display.h"
@@ skipping 159 matching lines @@
 void DisplayManager::OnDisplayAdded(int64_t id,
                                     const gfx::Rect& bounds,
                                     const gfx::Size& pixel_size,
                                     float scale_factor) {
   TRACE_EVENT1("mus-ws", "OnDisplayAdded", "id", id);
   PlatformDisplayInitParams params;
   params.display_id = id;
   params.metrics.bounds = bounds;
   params.metrics.pixel_size = pixel_size;
   params.metrics.device_scale_factor = scale_factor;
-  params.surfaces_state = window_server_->GetSurfacesState();
+  params.display_compositor = window_server_->GetDisplayCompositor();
 
   ws::Display* display = new ws::Display(window_server_, params);
   display->Init(nullptr);
 
   window_server_->delegate()->UpdateTouchTransforms();
 }
 
 void DisplayManager::OnDisplayRemoved(int64_t id) {
   TRACE_EVENT1("mus-ws", "OnDisplayRemoved", "id", id);
   Display* display = GetDisplayById(id);
   if (display)
     DestroyDisplay(display);
 }
 
 void DisplayManager::OnDisplayModified(int64_t id,
                                        const gfx::Rect& bounds,
                                        const gfx::Size& pixel_size,
                                        float scale_factor) {
   // TODO(kylechar): Implement.
   NOTREACHED();
 }
 
 }  // namespace ws
 }  // namespace ui