[cc] Fix CompositorFrameSinkSupport BeginFrameAck interface.

cc/surfaces/direct_compositor_frame_sink_unittest.cc

 // Copyright 2015 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/surfaces/direct_compositor_frame_sink.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "cc/output/renderer_settings.h"
@@ skipping 91 matching lines @@
 
   ~DirectCompositorFrameSinkTest() override {
     compositor_frame_sink_->DetachFromClient();
   }
 
   void SwapBuffersWithDamage(const gfx::Rect& damage_rect) {
     std::unique_ptr<RenderPass> render_pass(RenderPass::Create());
     render_pass->SetNew(1, display_rect_, damage_rect, gfx::Transform());
 
     CompositorFrame frame;
+    frame.metadata.begin_frame_ack = BeginFrameAck(0, 1, 1, 0, true);
     frame.render_pass_list.push_back(std::move(render_pass));
 
     compositor_frame_sink_->SubmitCompositorFrame(std::move(frame));
   }
 
   void SetUp() override {
     // Draw the first frame to start in an "unlocked" state.
     SwapBuffersWithDamage(display_rect_);
 
     EXPECT_EQ(0u, display_output_surface_->num_sent_frames());
@@ skipping 65 matching lines @@
  public:
   explicit TestBeginFrameObserver(BeginFrameSource* source) : source_(source) {}
 
   void FinishFrame() { source_->DidFinishFrame(this, ack()); }
 
   const BeginFrameAck& ack() const { return ack_; }
 
  private:
   bool OnBeginFrameDerivedImpl(const BeginFrameArgs& args) override {
     ack_ = BeginFrameAck(args.source_id, args.sequence_number,
-                         args.sequence_number, 0, true);
+                         args.sequence_number, 0, false);
     return true;
   }
 
   void OnBeginFrameSourcePausedChanged(bool paused) override{};
 
   BeginFrameSource* source_;
   BeginFrameAck ack_;
 };
 
-TEST_F(DirectCompositorFrameSinkTest, AcknowledgesBeginFrames) {
+TEST_F(DirectCompositorFrameSinkTest, AcknowledgesBeginFramesWithDamage) {
+  // Verify that the frame sink acknowledged the BeginFrame attached to
+  // CompositorFrame submitted during SetUp().
+  EXPECT_EQ(BeginFrameAck(0, 1, 1, 0, true), begin_frame_source_->last_ack());
+}
+
+TEST_F(DirectCompositorFrameSinkTest, AcknowledgesBeginFramesWithoutDamage) {
   // Request a BeginFrame from the CompositorFrameSinkClient.
   TestBeginFrameObserver observer(begin_frame_source_.get());
   compositor_frame_sink_client_.begin_frame_source()->AddObserver(&observer);
+  task_runner_->RunUntilIdle();
   observer.FinishFrame();
   compositor_frame_sink_client_.begin_frame_source()->RemoveObserver(&observer);
 
   // Verify that the frame sink acknowledged the last BeginFrame.
   EXPECT_EQ(observer.ack(), begin_frame_source_->last_ack());
 }
 
 }  // namespace
 }  // namespace cc