[cc] Remove BeginFrameAck from BFS::DidFinishFrame and update tests.

cc/scheduler/scheduler.cc

 // Copyright 2011 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 "cc/scheduler/scheduler.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
@@ skipping 425 matching lines @@
   state_machine_.OnBeginImplFrameIdle();
   ProcessScheduledActions();
 
   client_->DidFinishImplFrame();
   SendBeginFrameAck(begin_main_frame_args_, kBeginFrameFinished);
   begin_impl_frame_tracker_.Finish();
 }
 
 void Scheduler::SendBeginFrameAck(const BeginFrameArgs& args,
                                   BeginFrameResult result) {
-  if (!begin_frame_source_)
-    return;
+  bool did_submit = false;
+  if (result == kBeginFrameFinished)
+    did_submit = state_machine_.did_submit_in_last_frame();
 
-  uint64_t latest_confirmed_sequence_number =
-      BeginFrameArgs::kInvalidFrameNumber;
-  if (args.source_id == state_machine_.begin_frame_source_id()) {
-    latest_confirmed_sequence_number =
-        state_machine_
-            .last_begin_frame_sequence_number_compositor_frame_was_fresh();
+  if (!did_submit) {
+    uint64_t latest_confirmed_sequence_number =
+        BeginFrameArgs::kInvalidFrameNumber;
+    if (args.source_id == state_machine_.begin_frame_source_id()) {
+      latest_confirmed_sequence_number =
+          state_machine_
+              .last_begin_frame_sequence_number_compositor_frame_was_fresh();
+    }
+
+    client_->DidNotProduceFrame(
+        BeginFrameAck(args.source_id, args.sequence_number,
+                      latest_confirmed_sequence_number, did_submit));
   }
 
-  bool did_submit = false;
-  if (result == kBeginFrameFinished) {
-    did_submit = state_machine_.did_submit_in_last_frame();
-  }
-
-  BeginFrameAck ack(args.source_id, args.sequence_number,
-                    latest_confirmed_sequence_number, did_submit);
-  begin_frame_source_->DidFinishFrame(this, ack);
-  if (!did_submit)
-    client_->DidNotProduceFrame(ack);
+  if (begin_frame_source_)
+    begin_frame_source_->DidFinishFrame(this);
 }
 
 // BeginImplFrame starts a compositor frame that will wait up until a deadline
 // for a BeginMainFrame+activation to complete before it times out and draws
 // any asynchronous animation and scroll/pinch updates.
 void Scheduler::BeginImplFrame(const BeginFrameArgs& args,
                                base::TimeTicks now) {
   DCHECK_EQ(state_machine_.begin_impl_frame_state(),
             SchedulerStateMachine::BEGIN_IMPL_FRAME_STATE_IDLE);
   DCHECK(begin_impl_frame_deadline_task_.IsCancelled());
@@ skipping 359 matching lines @@
 }
 
 BeginFrameAck Scheduler::CurrentBeginFrameAckForActiveTree() const {
   return BeginFrameAck(
       begin_main_frame_args_.source_id, begin_main_frame_args_.sequence_number,
       state_machine_.last_begin_frame_sequence_number_active_tree_was_fresh(),
       true);
 }
 
 }  // namespace cc