[cc] Test that CFSSupport forwards BeginFrameAcks in CompositorFrames.

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 168 matching lines @@
   EXPECT_EQ(1u, display_output_surface_->num_sent_frames());
 
   SwapBuffersWithDamage(gfx::Rect());
   EXPECT_EQ(1u, display_output_surface_->num_sent_frames());
   task_runner_->RunUntilIdle();
   EXPECT_EQ(1u, display_output_surface_->num_sent_frames());
 }
 
 class TestBeginFrameObserver : public BeginFrameObserverBase {
  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, false);
     return true;
   }
 
   void OnBeginFrameSourcePausedChanged(bool paused) override{};
 
-  BeginFrameSource* source_;
   BeginFrameAck ack_;
 };
 
 TEST_F(DirectCompositorFrameSinkTest, AcknowledgesBeginFramesWithDamage) {
   // Verify that the frame sink acknowledged the BeginFrame attached to
   // CompositorFrame submitted during SetUp().
   EXPECT_EQ(BeginFrameAck(0, 1, 1, true), begin_frame_source_->last_ack());
 }
 
 TEST_F(DirectCompositorFrameSinkTest, AcknowledgesBeginFramesWithoutDamage) {
   // Request a BeginFrame from the CompositorFrameSinkClient.
-  TestBeginFrameObserver observer(begin_frame_source_.get());
+  TestBeginFrameObserver observer;
   compositor_frame_sink_client_.begin_frame_source()->AddObserver(&observer);
   task_runner_->RunUntilIdle();
-  observer.FinishFrame();
+  EXPECT_LE(BeginFrameArgs::kStartingFrameNumber,
+            observer.ack().sequence_number);
+  compositor_frame_sink_client_.begin_frame_source()->DidFinishFrame(
+      &observer, observer.ack());
   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