Add sub-metrics for Event.Latency.TouchToFirstScrollUpdateSwapBegin

content/browser/renderer_host/input/render_widget_host_latency_tracker_unittest.cc

 // Copyright 2014 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 "base/test/histogram_tester.h"
 #include "content/browser/renderer_host/input/render_widget_host_latency_tracker.h"
 #include "content/common/input/synthetic_web_input_event_builders.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 54 matching lines @@
         histogram_tester_->GetAllSamples(histogram_name).size();
     if (static_cast<uint64_t>(size) == histogram_size) {
       return ::testing::AssertionSuccess();
     } else {
       return ::testing::AssertionFailure() << histogram_name << " expected "
                                            << size << " entries, but had "
                                            << histogram_size;
     }
   }
 
+  void HistogramTotalCountEq(const std::string& name, int count) {

[tdresser, 2016/08/24 12:48:57]

Since this contains an expectation, it should have Expect in the name.

[lanwei, 2016/08/25 04:17:11]

Done.

+    histogram_tester_->ExpectTotalCount(name, count);
+  }
+
   RenderWidgetHostLatencyTracker* tracker() { return &tracker_; }
   void ResetHistograms() {
     histogram_tester_.reset(new base::HistogramTester());
   }
 
   const base::HistogramTester& histogram_tester() {
     return *histogram_tester_;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostLatencyTrackerTest);
   const int kTestRoutingId = 3;
   const int kTestProcessId = 1;
   std::unique_ptr<base::HistogramTester> histogram_tester_;
   RenderWidgetHostLatencyTracker tracker_;
 };
 
 TEST_F(RenderWidgetHostLatencyTrackerTest, TestHistograms) {
-  for (bool rendering_on_main : { false, true }) {
+  for (bool rendering_on_main : {false, true}) {
     for (bool is_running_navigation_hint_task : {false, true}) {
       ResetHistograms();
       {
         auto scroll = SyntheticWebGestureEventBuilder::BuildScrollUpdate(
             5.f, -5.f, 0, blink::WebGestureDeviceTouchscreen);
         scroll.timeStampSeconds =
             (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF();
         ui::LatencyInfo scroll_latency;
-        AddFakeComponents(*tracker(), &scroll_latency);
+        scroll_latency.AddLatencyNumber(
+            ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0, 0);
         AddRenderingScheduledComponent(&scroll_latency, rendering_on_main);
         tracker()->OnInputEvent(scroll, &scroll_latency);
         EXPECT_TRUE(scroll_latency.FindLatency(
             ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT,
             tracker()->latency_component_id(), nullptr));
         EXPECT_TRUE(scroll_latency.FindLatency(
             ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0, nullptr));
         EXPECT_EQ(1U, scroll_latency.input_coordinates_size());
         tracker()->OnInputEventAck(scroll, &scroll_latency,
                                    INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
@@ skipping 47 matching lines @@
       EXPECT_TRUE(
           HistogramSizeEq("Event.Latency.TouchToFirstScrollUpdateSwapBegin_"
                           "IsRunningNavigationHintTask",
                           is_running_navigation_hint_task ? 1 : 0));
       EXPECT_TRUE(
           HistogramSizeEq("Event.Latency.TouchToScrollUpdateSwapBegin", 1));
       EXPECT_TRUE(
           HistogramSizeEq("Event.Latency.TouchToScrollUpdateSwapBegin_"
                           "IsRunningNavigationHintTask",
                           is_running_navigation_hint_task ? 1 : 0));
+      EXPECT_TRUE(HistogramSizeEq(
+          "Event.Latency.FirstScrollUpdate.FirstTouchToHandled_Main",
+          rendering_on_main ? 1 : 0));
+      EXPECT_TRUE(HistogramSizeEq(
+          "Event.Latency.FirstScrollUpdate.FirstTouchToHandled_Impl",
+          rendering_on_main ? 0 : 1));
+      EXPECT_TRUE(HistogramSizeEq(
+          "Event.Latency.FirstScrollUpdate.HandledToRendererSwap_Main",
+          rendering_on_main ? 1 : 0));
+      EXPECT_TRUE(HistogramSizeEq(
+          "Event.Latency.FirstScrollUpdate.HandledToRendererSwap_Impl",
+          rendering_on_main ? 0 : 1));
+      EXPECT_TRUE(HistogramSizeEq(
+          "Event.Latency.FirstScrollUpdate.RendererSwapToBrowserNotified", 1));
+      EXPECT_TRUE(HistogramSizeEq(
+          "Event.Latency.FirstScrollUpdate.BrowserNotifiedToBeforeGpuSwap", 1));
+      EXPECT_TRUE(
+          HistogramSizeEq("Event.Latency.FirstScrollUpdate.GpuSwap", 1));
       EXPECT_TRUE(
           HistogramSizeEq("Event.Latency.ScrollUpdate.TouchToHandled_Main",
                           rendering_on_main ? 1 : 0));
       EXPECT_TRUE(
           HistogramSizeEq("Event.Latency.ScrollUpdate.TouchToHandled_Impl",
                           rendering_on_main ? 0 : 1));
       EXPECT_TRUE(HistogramSizeEq(
           "Event.Latency.ScrollUpdate.HandledToRendererSwap_Main",
           rendering_on_main ? 1 : 0));
       EXPECT_TRUE(HistogramSizeEq(
           "Event.Latency.ScrollUpdate.HandledToRendererSwap_Impl",
           rendering_on_main ? 0 : 1));
       EXPECT_TRUE(HistogramSizeEq(
           "Event.Latency.ScrollUpdate.RendererSwapToBrowserNotified", 1));
       EXPECT_TRUE(HistogramSizeEq(
           "Event.Latency.ScrollUpdate.BrowserNotifiedToBeforeGpuSwap", 1));
       EXPECT_TRUE(HistogramSizeEq("Event.Latency.ScrollUpdate.GpuSwap", 1));
+
+      {
+        auto second_scroll = SyntheticWebGestureEventBuilder::BuildScrollUpdate(
+            5.f, -5.f, 0, blink::WebGestureDeviceTouchscreen);
+        ui::LatencyInfo scroll_latency;
+        scroll_latency.AddLatencyNumber(
+            ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0, 0);
+        scroll_latency.AddLatencyNumber(
+            ui::INPUT_EVENT_LATENCY_TERMINATED_FRAME_SWAP_COMPONENT, 0, 0);
+        scroll_latency.AddLatencyNumber(
+            ui::INPUT_EVENT_GPU_SWAP_BUFFER_COMPONENT, 0, 0);
+        scroll_latency.AddLatencyNumber(
+            ui::INPUT_EVENT_LATENCY_RENDERER_SWAP_COMPONENT, 0, 0);
+        scroll_latency.AddLatencyNumber(
+            ui::INPUT_EVENT_BROWSER_RECEIVED_RENDERER_SWAP_COMPONENT, 0, 0);
+        AddRenderingScheduledComponent(&scroll_latency, rendering_on_main);
+        tracker()->OnInputEvent(second_scroll, &scroll_latency);
+        EXPECT_TRUE(scroll_latency.FindLatency(
+            ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT,
+            tracker()->latency_component_id(), nullptr));
+        EXPECT_TRUE(scroll_latency.FindLatency(
+            ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0, nullptr));
+        EXPECT_FALSE(scroll_latency.FindLatency(
+            ui::INPUT_EVENT_LATENCY_FIRST_SCROLL_UPDATE_ORIGINAL_COMPONENT, 0,
+            nullptr));
+        EXPECT_EQ(1U, scroll_latency.input_coordinates_size());
+        tracker()->OnInputEventAck(second_scroll, &scroll_latency,
+                                   INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
+        tracker()->OnFrameSwapped(scroll_latency,
+                                  is_running_navigation_hint_task);
+      }
+
+      HistogramTotalCountEq("Event.Latency.TouchToFirstScrollUpdateSwapBegin",
+                            1);
+      HistogramTotalCountEq(
+          "Event.Latency.TouchToFirstScrollUpdateSwapBegin_"
+          "IsRunningNavigationHintTask",
+          is_running_navigation_hint_task ? 1 : 0);
+      HistogramTotalCountEq("Event.Latency.TouchToScrollUpdateSwapBegin", 2);
+      HistogramTotalCountEq(
+          "Event.Latency.TouchToScrollUpdateSwapBegin_"
+          "IsRunningNavigationHintTask",
+          is_running_navigation_hint_task ? 2 : 0);
+      HistogramTotalCountEq(
+          "Event.Latency.FirstScrollUpdate.FirstTouchToHandled_Main",
+          rendering_on_main ? 1 : 0);
+      HistogramTotalCountEq(
+          "Event.Latency.FirstScrollUpdate.FirstTouchToHandled_Impl",
+          rendering_on_main ? 0 : 1);
+      HistogramTotalCountEq(
+          "Event.Latency.FirstScrollUpdate.HandledToRendererSwap_Main",
+          rendering_on_main ? 1 : 0);
+      HistogramTotalCountEq(
+          "Event.Latency.FirstScrollUpdate.HandledToRendererSwap_Impl",
+          rendering_on_main ? 0 : 1);
+      HistogramTotalCountEq(
+          "Event.Latency.FirstScrollUpdate.RendererSwapToBrowserNotified", 1);
+      HistogramTotalCountEq(
+          "Event.Latency.FirstScrollUpdate.BrowserNotifiedToBeforeGpuSwap", 1);
+      HistogramTotalCountEq("Event.Latency.FirstScrollUpdate.GpuSwap", 1);
+      HistogramTotalCountEq("Event.Latency.ScrollUpdate.TouchToHandled_Main",
+                            rendering_on_main ? 2 : 0);
+      HistogramTotalCountEq("Event.Latency.ScrollUpdate.TouchToHandled_Impl",
+                            rendering_on_main ? 0 : 2);
+      HistogramTotalCountEq(
+          "Event.Latency.ScrollUpdate.HandledToRendererSwap_Main",
+          rendering_on_main ? 2 : 0);
+      HistogramTotalCountEq(
+          "Event.Latency.ScrollUpdate.HandledToRendererSwap_Impl",
+          rendering_on_main ? 0 : 2);
+      HistogramTotalCountEq(
+          "Event.Latency.ScrollUpdate.RendererSwapToBrowserNotified", 2);
+      HistogramTotalCountEq(
+          "Event.Latency.ScrollUpdate.BrowserNotifiedToBeforeGpuSwap", 2);
+      HistogramTotalCountEq("Event.Latency.ScrollUpdate.GpuSwap", 2);
     }
   }
 }
 
 TEST_F(RenderWidgetHostLatencyTrackerTest,
        LatencyTerminatedOnAckIfRenderingNotScheduled) {
   {
     auto scroll = SyntheticWebGestureEventBuilder::BuildScrollBegin(
         5.f, -5.f, blink::WebGestureDeviceTouchscreen);
     ui::LatencyInfo scroll_latency;
@@ skipping 61 matching lines @@
     EXPECT_TRUE(key_latency.terminated());
   }
 
   EXPECT_TRUE(HistogramSizeEq("Event.Latency.Browser.WheelUI", 1));
   EXPECT_TRUE(HistogramSizeEq("Event.Latency.Browser.TouchUI", 1));
   EXPECT_TRUE(HistogramSizeEq("Event.Latency.Browser.WheelAcked", 1));
   EXPECT_TRUE(HistogramSizeEq("Event.Latency.Browser.TouchAcked", 1));
   EXPECT_TRUE(
       HistogramSizeEq("Event.Latency.TouchToFirstScrollUpdateSwapBegin", 1));
   EXPECT_TRUE(HistogramSizeEq("Event.Latency.TouchToScrollUpdateSwapBegin", 1));
+  EXPECT_TRUE(HistogramSizeEq(
+      "Event.Latency.FirstScrollUpdate.TouchToHandled_Main", 0));
+  EXPECT_TRUE(HistogramSizeEq(
+      "Event.Latency.FirstScrollUpdate.TouchToHandled_Impl", 0));
+  EXPECT_TRUE(HistogramSizeEq(
+      "Event.Latency.FirstScrollUpdate.HandledToRendererSwap_Main", 0));
+  EXPECT_TRUE(HistogramSizeEq(
+      "Event.Latency.FirstScrollUpdate.HandledToRendererSwap_Impl", 0));
+  EXPECT_TRUE(HistogramSizeEq(
+      "Event.Latency.FirstScrollUpdate.RendererSwapToBrowserNotified", 0));
+  EXPECT_TRUE(HistogramSizeEq(
+      "Event.Latency.FirstScrollUpdate.BrowserNotifiedToBeforeGpuSwap", 0));
+  EXPECT_TRUE(HistogramSizeEq("Event.Latency.FirstScrollUpdate.GpuSwap", 0));
   EXPECT_TRUE(
       HistogramSizeEq("Event.Latency.ScrollUpdate.TouchToHandled_Main", 0));
   EXPECT_TRUE(
       HistogramSizeEq("Event.Latency.ScrollUpdate.TouchToHandled_Impl", 0));
   EXPECT_TRUE(HistogramSizeEq(
       "Event.Latency.ScrollUpdate.HandledToRendererSwap_Main", 0));
   EXPECT_TRUE(HistogramSizeEq(
       "Event.Latency.ScrollUpdate.HandledToRendererSwap_Impl", 0));
   EXPECT_TRUE(HistogramSizeEq(
       "Event.Latency.ScrollUpdate.RendererSwapToBrowserNotified", 0));
@@ skipping 294 matching lines @@
                   "Event.Latency.BlockingTime.TouchEndDefaultPrevented"),
               ElementsAre(Bucket(
                   touchend_timestamps_ms[2] - touchend_timestamps_ms[1], 1)));
   EXPECT_THAT(histogram_tester().GetAllSamples(
                   "Event.Latency.BlockingTime.TouchEndDefaultAllowed"),
               ElementsAre(Bucket(
                   touchend_timestamps_ms[2] - touchend_timestamps_ms[1], 1)));
 }
 
 }  // namespace content