The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/1291e864d020e7bdcd216cfbfdf22b25728d1eee

commit 1291e864d020e7bdcd216cfbfdf22b25728d1eee
Author: rtoy <rtoy@chromium.org>
Date: Thu Feb 02 00:24:33 2017

Add use counter for cancelAndHoldAtTime.

BUG= 686254 
TEST=none

Review-Url: https://codereview.chromium.org/2663993003
Cr-Commit-Position: refs/heads/master@{#447655}

[modify] https://crrev.com/1291e864d020e7bdcd216cfbfdf22b25728d1eee/third_party/WebKit/Source/core/frame/UseCounter.h
[modify] https://crrev.com/1291e864d020e7bdcd216cfbfdf22b25728d1eee/third_party/WebKit/Source/modules/webaudio/AudioParam.idl
[modify] https://crrev.com/1291e864d020e7bdcd216cfbfdf22b25728d1eee/tools/metrics/histograms/histograms.xml

cancelAndHoldAtTime landed just before the M57 branch was cut but we inadvertently forgot to add measurements for it.  It would be good to have the measurements released with the feature.

Your change meets the bar and is auto-approved for M57. Please go ahead and merge the CL to branch 2987 manually. Please contact milestone owner if you have questions.
Owners: amineer@(clank), cmasso@(bling), ketakid@(cros), govind@(desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

govind: I need a little help with merging this to M57.  There's a simple conflict in updating UseCounter.h  In ToT, several new entries were added for WebNFC*.  These aren't in branch 2987.

If I do the merge, what value should I use for AudioParamCancelAndHoldAtTime?  On ToT it is 1797.  That would result in a gap on branch 2987. (Last value is 1792.)

+ dimu@, could you please help rtoy@ here (see comment #4).

Note that this isn't a must-have. Just thought it would be nice if the release with the new method would also have measurements for it.  But it's ok if the measurements are done in the next release.

This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible!

If all merges have been completed, please remove any remaining Merge-Approved labels from this issue.

Thanks for your time! To disable nags, add the Disable-Nags label.

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

What's the decision on the merge?

I also have some counters to merge in issue 687843. I'm waiting for the decision here in order not to introduce further conflicts.

Friendly ping.

I need some guidance on how to proceed because of the conflict when merging?  Should I just add the new entry?  That seems to be the right way to do this, leaving a gap for other earlier values.

I'm not familiar with the counter files. What is the numeric values for, is it just for indexing? Would there be problem if we leave no gap for earlier values? if some later commits needs these values, they can just increments the index by one.

I think it's basically a counter, but it's also tied to how UMA counts are reported.  I think we need to keep the counter value consistent with what's in ToT so that the counter value stays consistent between the branch and ToT.

But I'm not an expert on this.

I see, if we need to keep the counter value consistent then we can keep the gap.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/52b091dba082f09cb7ea0e708f5f1231be546389

commit 52b091dba082f09cb7ea0e708f5f1231be546389
Author: Raymond Toy <rtoy@chromium.org>
Date: Tue Feb 07 22:38:32 2017

Add use counter for cancelAndHoldAtTime.

BUG= 686254 
TEST=none

Review-Url: https://codereview.chromium.org/2663993003
Cr-Commit-Position: refs/heads/master@{#447655}
(cherry picked from commit 1291e864d020e7bdcd216cfbfdf22b25728d1eee)

Review-Url: https://codereview.chromium.org/2682733004 .
Cr-Commit-Position: refs/branch-heads/2987@{#371}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}

[modify] https://crrev.com/52b091dba082f09cb7ea0e708f5f1231be546389/third_party/WebKit/Source/core/frame/UseCounter.h
[modify] https://crrev.com/52b091dba082f09cb7ea0e708f5f1231be546389/third_party/WebKit/Source/modules/webaudio/AudioParam.idl
[modify] https://crrev.com/52b091dba082f09cb7ea0e708f5f1231be546389/tools/metrics/histograms/histograms.xml