Add more input metrics to Rappor

tools/metrics/rappor/rappor.xml

Index: tools/metrics/rappor/rappor.xml
diff --git a/tools/metrics/rappor/rappor.xml b/tools/metrics/rappor/rappor.xml
index 927580b6e8701c8b651c93e149e1f8ffa2bfa934..b842ac5d1c69006072e95622a33e2a0068809bb5 100644
--- a/tools/metrics/rappor/rappor.xml
+++ b/tools/metrics/rappor/rappor.xml
@@ -910,12 +910,12 @@ components/rappor/rappor_parameters.h.
 </rappor-metric>
 
 <rappor-metric
-    name="Event.Latency.ScrollUpdate.Touch.TimeToScrollUpdateSwapBegin2"
+    name="Event.Latency.ScrollBegin.Touch.TimeToScrollUpdateSwapBegin2"
     type="UMA_RAPPOR_TYPE">
   <owner>nzolghadr@chromium.org</owner>
   <owner>tdresser@chromium.org</owner>
   <summary>
-    The eTLD+1 of the website visited, along with a the time between the initial
+    The eTLD+1 of the website visited, along with the time between initial
     creation of a touch event and the start of the frame swap on the GPU service
     caused by the generated ScrollUpdate gesture event if that ScrollUpdate is
     the first such event in a given scroll gesture event sequence. If no swap
@@ -928,6 +928,55 @@ components/rappor/rappor_parameters.h.
   </string-field>
   <uint64-field name="Latency">
     <summary>
+      Latency in microseconds representing first
+      Touch.TimeToScrollUpdateSwapBegin.
+    </summary>
+  </uint64-field>
+</rappor-metric>
+
+<rappor-metric
+    name="Event.Latency.ScrollBegin.Wheel.TimeToScrollUpdateSwapBegin2"
+    type="UMA_RAPPOR_TYPE">
+  <owner>nzolghadr@chromium.org</owner>
+  <owner>tdresser@chromium.org</owner>
+  <summary>
+    The eTLD+1 of the website visited, along with  the time between initial
+    creation of a wheel event and the start of the frame swap on the GPU service
+    caused by the generated ScrollUpdate gesture event if that ScrollUpdate is
+    the first such event in a given scroll gesture event sequence. If no swap
+    was induced by the event, no recording is made.
+  </summary>
+  <string-field name="Domain">
+    <summary>
+      The domain+registry of the URL.
+    </summary>
+  </string-field>
+  <uint64-field name="Latency">
+    <summary>
+      Latency in microseconds representing first
+      Wheel.TimeToScrollUpdateSwapBegin.
+    </summary>
+  </uint64-field>
+</rappor-metric>
+
+<rappor-metric
+    name="Event.Latency.ScrollUpdate.Touch.TimeToScrollUpdateSwapBegin2"
+    type="UMA_RAPPOR_TYPE">
+  <owner>nzolghadr@chromium.org</owner>
+  <owner>tdresser@chromium.org</owner>
+  <summary>
+    The eTLD+1 of the website visited, along with the time between the initial
+    creation of a touch event and the start of the frame swap on the GPU service
+    caused by the generated ScrollUpdate gesture event. If no swap was induced
+    by the event, no recording is made.
+  </summary>
+  <string-field name="Domain">
+    <summary>
+      The domain+registry of the URL.
+    </summary>
+  </string-field>
+  <uint64-field name="Latency">
+    <summary>
       Latency in microseconds representing Touch.TimeToScrollUpdateSwapBegin.
     </summary>
   </uint64-field>