Fix CompositorFrameReporter dropped frame test

CompositorFrameReporterTest.SubmittedDroppedFrameReportingTest calls
DroppedFrame() explicitly and then terminates reporter with
kPresentedFrame status. This is not what happens in production code. We
just need to terminate frame with kDidNotPresentedFrame or
kReplacedByNewReporter and it will take care of reporting a dropped
frame.

Bug: None
Change-Id: I43059f31e77ec14818b856e51d24e7ea7a6c4545
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2037340Reviewed-by: Behdad Bakhshinategh <behdadb@chromium.org>
Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Commit-Queue: Mohsen Izadi <mohsen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738248}

cc/metrics/compositor_frame_reporter.cc

@@ -214,10 +214,6 @@ void CompositorFrameReporter::EndCurrentStage(base::TimeTicks end_time) {
   current_stage_.start_time = base::TimeTicks();
 }
 
-void CompositorFrameReporter::DroppedFrame() {
-  report_type_ = DroppedFrameReportType::kDroppedFrame;
-}
-
 void CompositorFrameReporter::TerminateFrame(
     FrameTerminationStatus termination_status,
     base::TimeTicks termination_time) {
@@ -261,6 +257,10 @@ void CompositorFrameReporter::SetVizBreakdown(
   viz_breakdown_ = viz_breakdown;
 }
 
+void CompositorFrameReporter::DroppedFrame() {
+  report_type_ = DroppedFrameReportType::kDroppedFrame;
+}
+
 void CompositorFrameReporter::TerminateReporter() {
   if (frame_termination_status_ == FrameTerminationStatus::kUnknown)
     TerminateFrame(FrameTerminationStatus::kUnknown, base::TimeTicks::Now());

cc/metrics/compositor_frame_reporter.h

@@ -129,8 +129,6 @@ class CC_EXPORT CompositorFrameReporter {
 
   const viz::BeginFrameId frame_id_;
 
-  void DroppedFrame();
-
   // Note that the started stage may be reported to UMA. If the histogram is
   // intended to be reported then the histograms.xml file must be updated too.
   void StartStage(StageType stage_type, base::TimeTicks start_time);
@@ -151,6 +149,8 @@ class CC_EXPORT CompositorFrameReporter {
   }
 
  private:
+  void DroppedFrame();
+
   void TerminateReporter();
   void EndCurrentStage(base::TimeTicks end_time);
   void ReportStageHistograms() const;

cc/metrics/compositor_frame_reporter_unittest.cc

@@ -154,9 +154,9 @@ TEST_F(CompositorFrameReporterTest, SubmittedDroppedFrameReportingTest) {
   EXPECT_EQ(1, pipeline_reporter_->StageHistorySizeForTesting());
 
   AdvanceNowByMs(2);
-  pipeline_reporter_->DroppedFrame();
   pipeline_reporter_->TerminateFrame(
-      CompositorFrameReporter::FrameTerminationStatus::kPresentedFrame, Now());
+      CompositorFrameReporter::FrameTerminationStatus::kDidNotPresentFrame,
+      Now());
   EXPECT_EQ(2, pipeline_reporter_->StageHistorySizeForTesting());
 
   pipeline_reporter_ = nullptr;