1 files changed, 25 insertions, 27 deletions
diff --git a/chromium/cc/metrics/compositor_frame_reporting_controller_unittest.cc b/chromium/cc/metrics/compositor_frame_reporting_controller_unittest.cc
index e12ba768f17..6fd89c4a30a 100644
--- a/chromium/cc/metrics/compositor_frame_reporting_controller_unittest.cc
+++ b/chromium/cc/metrics/compositor_frame_reporting_controller_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "base/macros.h"
 #include "base/test/metrics/histogram_tester.h"
+#include "components/viz/common/frame_timing_details.h"
 #include "components/viz/common/quads/compositor_frame_metadata.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -93,8 +94,9 @@ class CompositorFrameReportingControllerTest : public testing::Test {
   void SimulatePresentCompositorFrame() {
     ++next_token_;
     SimulateSubmitCompositorFrame(*next_token_);
-    reporting_controller_.DidPresentCompositorFrame(*next_token_,
-                                                    base::TimeTicks::Now());
+    viz::FrameTimingDetails details = {};
+    details.presentation_feedback.timestamp = base::TimeTicks::Now();
+    reporting_controller_.DidPresentCompositorFrame(*next_token_, details);
   }
 
  protected:
@@ -171,41 +173,37 @@ TEST_F(CompositorFrameReportingControllerTest,
 
   // 2 reporters active.
   SimulateActivate();
-  SimulateBeginImplFrame();
+  SimulateCommit();
 
-  // Submitting and Presenting the next reporter should be a missed.
+  // Submitting and Presenting the next reporter which will be a normal frame.
   SimulatePresentCompositorFrame();
 
   histogram_tester.ExpectTotalCount(
-      "CompositorLatency.MissedFrame.BeginImplFrameToSendBeginMainFrame", 1);
+      "CompositorLatency.MissedFrame.BeginImplFrameToSendBeginMainFrame", 0);
   histogram_tester.ExpectTotalCount(
-      "CompositorLatency.MissedFrame.SendBeginMainFrameToCommit", 1);
-  histogram_tester.ExpectTotalCount("CompositorLatency.MissedFrame.Commit", 1);
+      "CompositorLatency.MissedFrame.SendBeginMainFrameToCommit", 0);
+  histogram_tester.ExpectTotalCount("CompositorLatency.MissedFrame.Commit", 0);
   histogram_tester.ExpectTotalCount(
-      "CompositorLatency.MissedFrame.EndCommitToActivation", 1);
+      "CompositorLatency.MissedFrame.EndCommitToActivation", 0);
   histogram_tester.ExpectTotalCount("CompositorLatency.MissedFrame.Activation",
-                                    1);
+                                    0);
   histogram_tester.ExpectTotalCount(
-      "CompositorLatency.MissedFrame.EndActivateToSubmitCompositorFrame", 1);
-
-  // Other histograms should not be reported.
+      "CompositorLatency.MissedFrame.EndActivateToSubmitCompositorFrame", 0);
   histogram_tester.ExpectTotalCount(
-      "CompositorLatency.BeginImplFrameToSendBeginMainFrame", 0);
+      "CompositorLatency.BeginImplFrameToSendBeginMainFrame", 1);
   histogram_tester.ExpectTotalCount(
-      "CompositorLatency.SendBeginMainFrameToCommit", 0);
-  histogram_tester.ExpectTotalCount("CompositorLatency.Commit", 0);
+      "CompositorLatency.SendBeginMainFrameToCommit", 1);
+  histogram_tester.ExpectTotalCount("CompositorLatency.Commit", 1);
   histogram_tester.ExpectTotalCount("CompositorLatency.EndCommitToActivation",
-                                    0);
-  histogram_tester.ExpectTotalCount("CompositorLatency.Activation", 0);
+                                    1);
+  histogram_tester.ExpectTotalCount("CompositorLatency.Activation", 1);
   histogram_tester.ExpectTotalCount(
-      "CompositorLatency.EndActivateToSubmitCompositorFrame", 0);
+      "CompositorLatency.EndActivateToSubmitCompositorFrame", 1);
 
-  // Submitting the next reporter will not be counted as missed.
-  // In practice this submitted frame should be considered as missed because a
-  // new BeginFrame would have been issued, which is the cause for this frame
-  // submission.
-  SimulatePresentCompositorFrame();
-  // Other histograms should not be reported.
+  // Submitting the next reporter will be replaced as a result of a new commit.
+  // And this will be reported for all stage before activate as a missed frame.
+  SimulateCommit();
+  // Non Missed frame histogram counts should not change.
   histogram_tester.ExpectTotalCount(
       "CompositorLatency.BeginImplFrameToSendBeginMainFrame", 1);
   histogram_tester.ExpectTotalCount(
@@ -217,7 +215,7 @@ TEST_F(CompositorFrameReportingControllerTest,
   histogram_tester.ExpectTotalCount(
       "CompositorLatency.EndActivateToSubmitCompositorFrame", 1);
 
-  // Missed frame histogram counts should not change.
+  // Other histograms should be reported updated.
   histogram_tester.ExpectTotalCount(
       "CompositorLatency.MissedFrame.BeginImplFrameToSendBeginMainFrame", 1);
   histogram_tester.ExpectTotalCount(
@@ -226,9 +224,9 @@ TEST_F(CompositorFrameReportingControllerTest,
   histogram_tester.ExpectTotalCount(
       "CompositorLatency.MissedFrame.EndCommitToActivation", 1);
   histogram_tester.ExpectTotalCount("CompositorLatency.MissedFrame.Activation",
-                                    1);
+                                    0);
   histogram_tester.ExpectTotalCount(
-      "CompositorLatency.MissedFrame.EndActivateToSubmitCompositorFrame", 1);
+      "CompositorLatency.MissedFrame.EndActivateToSubmitCompositorFrame", 0);
 }
 }  // namespace
 }  // namespace cc