tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index bfabea4f159f7878e7d44a9c4c6f01d83443c727..948a3bdf0ae59f72deab1fc5af9665bd5ffed791 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -9912,6 +9912,28 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="DesktopIOSPromotion.CompletionTime" units="hours">
+  <owner>mrefaat@chromium.org</owner>
+  <summary>
+    [IOS] Time between when the client time of triggering the SMS action on a
+    specific entry point promotion on desktop and client time of signing in
+    Chrome iOS app. CompletionTime will be prefixed by the entry point promotion
+    name that was responsible for the SMS sending.
+  </summary>
+</histogram>
+
+<histogram name="DesktopIOSPromotion.IOSSigninReason"
+    enum="DesktopIOSPromotionEntryPoint">
+  <owner>mrefaat@chromium.org</owner>
+  <summary>
+    [IOS] For users who sign-in on Chrome for iOS, log the type of the desktop
+    iOS promotions that was shown to the user. This will only be logged if at
+    least one promotion was shown to this user on the last 7 days.
+    IOSigninReason will be prefixed to indicate if there was SMS sent from the
+    promotion or not.

[Mark P, 2017/01/26 18:55:15]

This last part of the description doesn't sound right.  It looks to me like you
only emit one SMSSent entry, regardless of whether the user sent SMS from
multiple promotions.

if (sms_entrypoint == i) {
  ...
}

[mrefaat, 2017/01/26 23:34:12]

I'll try to explain more.

+  </summary>
+</histogram>
+
 <histogram name="DevTools.ActionTaken" enum="DevToolsAction">
   <owner>sergeyv@chromium.org</owner>
   <owner>vsevik@chromium.org</owner>
@@ -25920,6 +25942,11 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="Media.Video.TimeFromForegroundToFirstFrame" units="ms">
+  <obsolete>
+    Deprecated as of 01/18/2017 in issue 670150. Replaced by

[Mark P, 2017/01/26 18:55:15]

It's odd for this to show up in the diff.
Did a conflict get resolved incorrectly?

[mrefaat, 2017/01/26 23:34:12]

probably i resolve conflicts every time i pull :S 

+    Media.Video.TimeFromForegroundToFirstFrame.DisabledTrack and
+    Media.Video.TimeFromForegroundToFirstFrame.Paused.
+  </obsolete>
   <owner>avayvod@chromium.org</owner>
   <owner>dalecurtis@chromium.org</owner>
   <summary>
@@ -25928,6 +25955,30 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="Media.Video.TimeFromForegroundToFirstFrame.DisabledTrack"
+    units="ms">
+  <owner>avayvod@chromium.org</owner>
+  <owner>dalecurtis@chromium.org</owner>
+  <summary>
+    Records the time between the moment when the video element that had video
+    track disabled in the background is brought to the foreground and when the
+    video frame compositor outputs the next frame. Recorded even if disabling
+    video track in the background is turned off to collect data for the control
+    group.
+  </summary>
+</histogram>
+
+<histogram name="Media.Video.TimeFromForegroundToFirstFrame.Paused" units="ms">
+  <owner>avayvod@chromium.org</owner>
+  <owner>dalecurtis@chromium.org</owner>
+  <summary>
+    Records the time between the moment when the video element that was paused
+    in the background is brought to the foreground and when the video frame
+    compositor outputs the next frame. Recorded even if disabling pausing video
+    in the background is turned off to collect data for the control group.
+  </summary>
+</histogram>
+
 <histogram name="Media.VideoCapture.AspectRatio" units="%">
   <owner>mcasas@chromium.org</owner>
   <summary>
@@ -80606,7 +80657,6 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <int value="13" label="Media setting (camera)"/>
   <int value="14" label="Protocol Handler setting"/>
   <int value="15" label="PPAPI Broker setting"/>
-  <int value="16" label="Automatic downloads setting"/>
   <int value="17" label="MIDI sysex setting"/>
   <int value="18" label="Push messaging setting [removed]"/>
   <int value="19" label="SSL Certificate Decisions setting"/>
@@ -82062,6 +82112,13 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <int value="12" label="Tab capturer created without audio capturer."/>
 </enum>
 
+<enum name="DesktopIOSPromotionEntryPoint" type="int">
+  <int value="1" label="Save Passwords new bubble."/>
+  <int value="2" label="Bookmarks new bubble."/>
+  <int value="3" label="Bookmarks existing bubble."/>
+  <int value="4" label="HistoryPage."/>
+</enum>
+
 <enum name="DesktopSearchRedirectionInfobarCloseAction" type="int">
   <int value="0" label="Clicked the 'Manage search settings' link"/>
   <int value="1" label="Clicked the dismiss button"/>
@@ -110414,6 +110471,22 @@ value.
       name="Prerender.SimulatedLocalBrowsingPLT_PrerenderNoUse"/>
 </histogram_suffixes>
 
+<histogram_suffixes name="DesktopIOSEntryPoints" separator="."
+    ordering="prefix">
+  <suffix name="SavePasswordsNewBubble"/>
+  <suffix name="BookmarksNewBubble"/>
+  <suffix name="BookmarksExistingBubble"/>
+  <suffix name="HistoryPage"/>
+  <affected-histogram name="DesktopIOSPromotion.CompletionTime"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="DesktopIOSPromotionSMSSent" separator="."
+    ordering="prefix">
+  <suffix name="SMSSent" label="SMS sent from the promotion."/>
+  <suffix name="NoSMS" label="No SMS was sent from the promotion."/>
+  <affected-histogram name="DesktopIOSPromotion.IOSSigninReason"/>
+</histogram_suffixes>
+

[Mark P, 2017/01/26 18:55:15]

Did you intentionally remove the histograms DesktopIOSPromotion.UserAction and
DesktopIOSPromotion.ImpressionFromEntryPoint from this file?  They were in your
other changelist.  (Are they no longer planned to be omitted somewhere?)

[mrefaat, 2017/01/26 23:34:12]

i removed them as i'm not using them on this cl, they will be used on a
different cl, so i'll be adding them later.

[Mark P, 2017/01/26 23:47:24]

Acknowledged.

 <histogram_suffixes name="DiskUsagePerUserCount" separator=".">
   <suffix name="1User" label="Only 1 user exists on device."/>
   <suffix name="2Users" label="2 users exist on device."/>