cc: Get rid of SurfaceDestroyed and use SurfaceDiscarded instead

cc/surfaces/display.cc

Index: cc/surfaces/display.cc
diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc
index a46731ff523e5a3dccf746344122c35892099f86..c4c8333280d2ba17aabe1fe1a523103f1bd90174 100644
--- a/cc/surfaces/display.cc
+++ b/cc/surfaces/display.cc
@@ -431,11 +431,6 @@ void Display::OnSurfaceCreated(const SurfaceInfo& surface_info) {
     scheduler_->SurfaceCreated(surface_info);
 }
 
-void Display::OnSurfaceDestroyed(const SurfaceId& surface_id) {
-  if (scheduler_)
-    scheduler_->SurfaceDestroyed(surface_id);
-}
-
 void Display::OnSurfaceDamageExpected(const SurfaceId& surface_id,
                                       const BeginFrameArgs& args) {
   if (scheduler_)
@@ -443,6 +438,9 @@ void Display::OnSurfaceDamageExpected(const SurfaceId& surface_id,
 }
 
 void Display::OnSurfaceDiscarded(const SurfaceId& surface_id) {
+  if (scheduler_)
+    scheduler_->SurfaceDiscarded(surface_id);
+
   if (aggregator_)
     aggregator_->ReleaseResources(surface_id);
 }