Add more input metrics to Rappor

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 "components/rappor/public/rappor_utils.h"
 #include "components/rappor/test_rappor_service.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"
@@ skipping 73 matching lines @@
 };
 
 class RenderWidgetHostLatencyTrackerTest
     : public RenderViewHostImplTestHarness {
  public:
   RenderWidgetHostLatencyTrackerTest() : old_browser_client_(NULL) {
     tracker_.Initialize(kTestRoutingId, kTestProcessId);
     ResetHistograms();
   }
 
+  void RapporSampleAssert(const char* rappor_name, int count) {

[tdresser, 2016/12/22 15:17:14]

Can this be a method returning an AssertionResult instead of having EXPECTs?
This approach makes the reported line numbers hard to interpret.

Details here:
https://github.com/google/googletest/blob/master/googletest/docs/AdvancedGuid...

[Navid Zolghadr, 2016/12/22 16:58:49]

Done.

+    rappor::TestSample::Shadow* sample_obj =
+        test_browser_client_.getTestRapporService()->GetRecordedSampleForMetric(
+            rappor_name);
+    if (count) {
+      EXPECT_NE(nullptr, sample_obj);
+      if (sample_obj) {
+        const auto& domain_it = sample_obj->string_fields.find("Domain");
+        EXPECT_NE(domain_it, sample_obj->string_fields.end());
+        EXPECT_EQ("bar.com", domain_it->second);
+        const auto& latency_it = sample_obj->uint64_fields.find("Latency");
+        EXPECT_NE(latency_it, sample_obj->uint64_fields.end());
+        EXPECT_EQ(rappor::NO_NOISE, latency_it->second.second);
+      }
+      EXPECT_EQ(count,
+                test_browser_client_.getTestRapporService()->GetReportsCount());
+    } else {
+      EXPECT_EQ(nullptr, sample_obj);
+    }
+  }
+
   ::testing::AssertionResult HistogramSizeEq(const char* histogram_name,
                                              int size) {
     uint64_t histogram_size =
         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;
@@ skipping 24 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostLatencyTrackerTest);
   const int kTestRoutingId = 3;
   const int kTestProcessId = 1;
   std::unique_ptr<base::HistogramTester> histogram_tester_;
   RenderWidgetHostLatencyTracker tracker_;
   RenderWidgetHostLatencyTrackerTestBrowserClient test_browser_client_;
   ContentBrowserClient* old_browser_client_;
 };
 
 TEST_F(RenderWidgetHostLatencyTrackerTest, TestWheelToFirstScrollHistograms) {
+  const GURL url("http://www.foo.bar.com/subpage/1");
+  contents()->NavigateAndCommit(url);
   for (bool rendering_on_main : {false, true}) {
     for (bool is_running_navigation_hint_task : {false, true}) {
       ResetHistograms();
       {
         auto wheel = SyntheticWebMouseWheelEventBuilder::Build(
             blink::WebMouseWheelEvent::PhaseChanged);
         base::TimeTicks now = base::TimeTicks::Now();
         wheel.timeStampSeconds = (now - base::TimeTicks()).InSecondsF();
         ui::LatencyInfo wheel_latency(ui::SourceEventType::WHEEL);
         wheel_latency.AddLatencyNumberWithTimestamp(
             ui::INPUT_EVENT_LATENCY_FIRST_SCROLL_UPDATE_ORIGINAL_COMPONENT,
             tracker()->latency_component_id(), 0, now, 1);
         AddFakeComponentsWithTimeStamp(*tracker(), &wheel_latency, now);
         AddRenderingScheduledComponent(&wheel_latency, rendering_on_main, now);
         tracker()->OnInputEvent(wheel, &wheel_latency);
         EXPECT_TRUE(wheel_latency.FindLatency(
             ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT,
             tracker()->latency_component_id(), nullptr));
         EXPECT_TRUE(wheel_latency.FindLatency(
             ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0, nullptr));
         EXPECT_EQ(1U, wheel_latency.input_coordinates_size());
         tracker()->OnInputEventAck(wheel, &wheel_latency,
                                    INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
         tracker()->OnFrameSwapped(wheel_latency,
                                   is_running_navigation_hint_task);
+
+        // Rappor metrics

[tdresser, 2016/12/22 15:17:14]

Missing . at the end, and elsewhere.

[Navid Zolghadr, 2016/12/22 16:58:49]

Done.

+        RapporSampleAssert(
+            "Event.Latency.ScrollUpdate.Touch."
+            "TimeToScrollUpdateSwapBegin2", 0);
+        RapporSampleAssert(
+            "Event.Latency.ScrollBegin.Touch."
+            "TimeToScrollUpdateSwapBegin2", 0);
+        RapporSampleAssert(
+            "Event.Latency.ScrollBegin.Wheel."
+            "TimeToScrollUpdateSwapBegin2", 2);
+
+        // UMA histograms
         EXPECT_TRUE(HistogramSizeEq("Event.Latency.Browser.WheelUI", 1));
         EXPECT_TRUE(HistogramSizeEq("Event.Latency.Browser.WheelAcked", 1));
 
         EXPECT_TRUE(
             HistogramSizeEq("Event.Latency.ScrollBegin.Wheel."
                             "TimeToScrollUpdateSwapBegin2",
                             1));
         EXPECT_TRUE(HistogramSizeEq(
             "Event.Latency.ScrollBegin.Wheel.TimeToHandled2_Main",
             rendering_on_main ? 1 : 0));
@@ skipping 109 matching lines @@
             "Event.Latency.ScrollUpdate.Wheel.BrowserNotifiedToBeforeGpuSwap2",
             1));
         EXPECT_TRUE(
             HistogramSizeEq("Event.Latency.ScrollUpdate.Wheel.GpuSwap2", 1));
       }
     }
   }
 }
 
 TEST_F(RenderWidgetHostLatencyTrackerTest, TestTouchToFirstScrollHistograms) {
+  const GURL url("http://www.foo.bar.com/subpage/1");
+  contents()->NavigateAndCommit(url);
   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);
         base::TimeTicks now = base::TimeTicks::Now();
         scroll.timeStampSeconds = (now - base::TimeTicks()).InSecondsF();
         ui::LatencyInfo scroll_latency;
         scroll_latency.AddLatencyNumberWithTimestamp(
@@ skipping 29 matching lines @@
             tracker()->latency_component_id(), nullptr));
         EXPECT_TRUE(touch_latency.FindLatency(
             ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0, nullptr));
         EXPECT_EQ(2U, touch_latency.input_coordinates_size());
         tracker()->OnInputEventAck(touch, &touch_latency,
                                    INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
         tracker()->OnFrameSwapped(touch_latency,
                                   is_running_navigation_hint_task);
       }
 
+      // Rappor metrics
+      RapporSampleAssert(
+          "Event.Latency.ScrollUpdate.Touch."
+          "TimeToScrollUpdateSwapBegin2", 0);
+      RapporSampleAssert(
+          "Event.Latency.ScrollBegin.Touch."
+          "TimeToScrollUpdateSwapBegin2", 2);
+      RapporSampleAssert(
+          "Event.Latency.ScrollBegin.Wheel."
+          "TimeToScrollUpdateSwapBegin2", 0);
+
+      // UMA histograms
       EXPECT_TRUE(HistogramSizeEq("Event.Latency.Browser.TouchUI", 1));
       EXPECT_TRUE(HistogramSizeEq("Event.Latency.Browser.TouchAcked", 1));
       EXPECT_TRUE(HistogramSizeEq(
           "Event.Latency.TouchToFirstScrollUpdateSwapBegin", 1));
       EXPECT_TRUE(
           HistogramSizeEq("Event.Latency.TouchToFirstScrollUpdateSwapBegin_"
                           "IsRunningNavigationHintTask",
                           is_running_navigation_hint_task ? 1 : 0));
       EXPECT_TRUE(
           HistogramSizeEq("Event.Latency.TouchToScrollUpdateSwapBegin", 1));
@@ skipping 115 matching lines @@
         EXPECT_TRUE(touch_latency.FindLatency(
             ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0, nullptr));
         EXPECT_EQ(2U, touch_latency.input_coordinates_size());
         tracker()->OnInputEventAck(touch, &touch_latency,
                                    INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
         tracker()->OnFrameSwapped(touch_latency,
                                   is_running_navigation_hint_task);
       }
 
       // Rappor metrics
-      rappor::TestSample::Shadow* sample_obj =
-          test_browser_client_.getTestRapporService()
-              ->GetRecordedSampleForMetric(
-                  "Event.Latency.ScrollUpdate.Touch."
-                  "TimeToScrollUpdateSwapBegin2");
-      EXPECT_NE(nullptr, sample_obj);
-      const auto& domain_it = sample_obj->string_fields.find("Domain");
-      EXPECT_NE(domain_it, sample_obj->string_fields.end());
-      EXPECT_EQ("bar.com", domain_it->second);
-      const auto& latency_it = sample_obj->uint64_fields.find("Latency");
-      EXPECT_NE(latency_it, sample_obj->uint64_fields.end());
-      EXPECT_EQ(rappor::NO_NOISE, latency_it->second.second);
-
-      EXPECT_EQ(2,
-                test_browser_client_.getTestRapporService()->GetReportsCount());
+      RapporSampleAssert(
+          "Event.Latency.ScrollUpdate.Touch."
+          "TimeToScrollUpdateSwapBegin2", 2);
+      RapporSampleAssert(
+          "Event.Latency.ScrollBegin.Touch."
+          "TimeToScrollUpdateSwapBegin2", 0);
+      RapporSampleAssert(
+          "Event.Latency.ScrollBegin.Wheel."
+          "TimeToScrollUpdateSwapBegin2", 0);
 
       // UMA histograms
       EXPECT_TRUE(HistogramSizeEq(
           "Event.Latency.ScrollBegin.Touch.TimeToScrollUpdateSwapBegin2", 0));
       EXPECT_TRUE(HistogramSizeEq(
           "Event.Latency.ScrollUpdate.Touch.TimeToScrollUpdateSwapBegin2", 1));
       EXPECT_TRUE(HistogramSizeEq(
           "Event.Latency.ScrollBegin.Touch.TimeToHandled2_Main", 0));
       EXPECT_TRUE(HistogramSizeEq(
           "Event.Latency.ScrollBegin.Touch.TimeToHandled2_Impl", 0));
@@ skipping 420 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