cc: Unify use of DidSwapBuffers() and did_request_swap

cc/scheduler/scheduler_state_machine.h

Index: cc/scheduler/scheduler_state_machine.h
diff --git a/cc/scheduler/scheduler_state_machine.h b/cc/scheduler/scheduler_state_machine.h
index 277926471a3feaa4b4f6c7c7e1833ddcce5c0bd8..b619b494a893009032528c0ecf2f6f40b002b656 100644
--- a/cc/scheduler/scheduler_state_machine.h
+++ b/cc/scheduler/scheduler_state_machine.h
@@ -189,7 +189,7 @@ class CC_EXPORT SchedulerStateMachine {
   bool smoothness_takes_priority() const { return smoothness_takes_priority_; }
 
   // Indicates whether ACTION_DRAW_AND_SWAP_IF_POSSIBLE drew to the screen.
-  void DidDrawIfPossibleCompleted(DrawSwapReadbackResult::DrawResult result);
+  void DidDrawIfPossibleCompleted(DrawResult result);
 
   // Indicates that a new commit flow needs to be performed, either to pull
   // updates from the main thread to the impl, or to push deltas from the impl
@@ -265,13 +265,14 @@ class CC_EXPORT SchedulerStateMachine {
 
   void AdvanceCurrentFrameNumber();
   bool HasSentBeginMainFrameThisFrame() const;
+  bool HasSentDrawRequestThisFrame() const;
   bool HasScheduledManageTilesThisFrame() const;
   bool HasUpdatedVisibleTilesThisFrame() const;
   bool HasSwappedThisFrame() const;
 
   void UpdateStateOnCommit(bool commit_was_aborted);
   void UpdateStateOnActivation();
-  void UpdateStateOnDraw(bool did_request_swap);
+  void UpdateStateOnDraw();
   void UpdateStateOnManageTiles();
 
   const SchedulerSettings settings_;
@@ -288,6 +289,7 @@ class CC_EXPORT SchedulerStateMachine {
   int current_frame_number_;
   int last_frame_number_swap_performed_;
   int last_frame_number_begin_main_frame_sent_;
+  int last_frame_number_draw_request_sent_;
   int last_frame_number_update_visible_tiles_was_called_;
 
   // manage_tiles_funnel_ is "filled" each time ManageTiles is called