Revert of Add DisplayScheduler for Surfaces

mojo/services/surfaces/surfaces_scheduler.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 "mojo/services/surfaces/surfaces_scheduler.h"
 
 #include "cc/surfaces/display.h"
 
 namespace surfaces {
 
@@ skipping 38 matching lines @@
 }
 
 void SurfacesScheduler::ScheduledActionSendBeginMainFrame() {
   scheduler_->NotifyBeginMainFrameStarted();
   scheduler_->NotifyReadyToCommit();
 }
 
 cc::DrawResult SurfacesScheduler::ScheduledActionDrawAndSwapIfPossible() {
   base::TimeTicks start = base::TimeTicks::Now();
   for (const auto& it : displays_) {
-    it->DrawAndSwap();
+    it->Draw();
   }
   base::TimeDelta duration = base::TimeTicks::Now() - start;
 
   draw_estimate_ = (duration + draw_estimate_) / 2;
   return cc::DRAW_SUCCESS;
 }
 
 cc::DrawResult SurfacesScheduler::ScheduledActionDrawAndSwapForced() {
   NOTREACHED() << "ScheduledActionDrawAndSwapIfPossible always succeeds.";
   return cc::DRAW_SUCCESS;
@@ skipping 37 matching lines @@
 }
 
 void SurfacesScheduler::SendBeginFramesToChildren(
     const cc::BeginFrameArgs& args) {
 }
 
 void SurfacesScheduler::SendBeginMainFrameNotExpectedSoon() {
 }
 
 }  // namespace mojo