Mus+Ash: Use standard cc mechanism for surface lifetime.

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 605 matching lines @@
   if (!window_paint_callback_.is_null())
     window_paint_callback_.Run(window);
 }
 
 const ServerWindow* WindowServer::GetRootWindow(
     const ServerWindow* window) const {
   const Display* display = display_manager_->GetDisplayContaining(window);
   return display ? display->root_window() : nullptr;
 }
 
-void WindowServer::ScheduleSurfaceDestruction(ServerWindow* window) {
-  Display* display = display_manager_->GetDisplayContaining(window);
-  if (display)
-    display->ScheduleSurfaceDestruction(window);
-}
-
 void WindowServer::OnWindowDestroyed(ServerWindow* window) {
   ProcessWindowDeleted(window);
 }
 
 void WindowServer::OnWillChangeWindowHierarchy(ServerWindow* window,
                                                ServerWindow* new_parent,
                                                ServerWindow* old_parent) {
   if (in_destructor_)
     return;
 
@@ skipping 177 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