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

commit 412ef84048d767626e0d95ad2c14fd3f43398eff
Author: dullweber <dullweber@chromium.org>
Date: Mon Jun 12 13:51:30 2017

Add metrics for new CBD dialog

Add metrics for the new Clear Browsing Data dialog on Android.
A histogram and actions are used to record which tab was used for a
deletion.
Time period changes are recorded as actions.
A bug is fixed where "ClearBrowsingData_DialogCreated" was recorded
twice because the new dialog creates two instances of
ClearBrowsingDataPreferences.

BUG= 731120 

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

[modify] https://crrev.com/412ef84048d767626e0d95ad2c14fd3f43398eff/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
[modify] https://crrev.com/412ef84048d767626e0d95ad2c14fd3f43398eff/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataTabsFragment.java
[modify] https://crrev.com/412ef84048d767626e0d95ad2c14fd3f43398eff/chrome/browser/android/browsing_data/browsing_data_bridge.cc
[modify] https://crrev.com/412ef84048d767626e0d95ad2c14fd3f43398eff/chrome/browser/android/preferences/pref_service_bridge.cc
[modify] https://crrev.com/412ef84048d767626e0d95ad2c14fd3f43398eff/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
[modify] https://crrev.com/412ef84048d767626e0d95ad2c14fd3f43398eff/components/browsing_data/core/browsing_data_utils.cc
[modify] https://crrev.com/412ef84048d767626e0d95ad2c14fd3f43398eff/components/browsing_data/core/browsing_data_utils.h
[modify] https://crrev.com/412ef84048d767626e0d95ad2c14fd3f43398eff/components/browsing_data/core/clear_browsing_data_tab.h
[modify] https://crrev.com/412ef84048d767626e0d95ad2c14fd3f43398eff/tools/metrics/actions/actions.xml
[modify] https://crrev.com/412ef84048d767626e0d95ad2c14fd3f43398eff/tools/metrics/histograms/enums.xml
[modify] https://crrev.com/412ef84048d767626e0d95ad2c14fd3f43398eff/tools/metrics/histograms/histograms.xml

This bug requires manual review: M60 has already been promoted to the beta branch, so this requires manual review
Please contact the milestone owner if you have questions.
Owners: amineer@(Android), cmasso@(iOS), josafat@(ChromeOS), bustamante@(Desktop)

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

We would like to merge some additional histograms and actions to M60. No other logic was changed in this CL.

We shouldn't be adding new metrics post-branch, sorry - merge rejected.  Please add these prior to branch.

This CL also contained a bugfix for an existing action that was accidentally logged twice. The affected files are:

chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataTabsFragment.java

Is it ok to merge these files? The incorrect logging would make it hard to analyse the metrics for this launch: http://crbug.com/717984
If yes, which approach would you suggest? 
Should I use the CL from above and create another patchset, where I revert all other changes before landing it on beta?

It is OK to merge a small bug fix for an existing metric.  I will approve for M60 branch 3112 for that use case.

You can use whichever approach is easiest for you; I've seen it done both ways, both have advantages / disadvantages.

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

commit 69601320533e89949caa6cb3a05b63ff4804da59
Author: Christian Dullweber <dullweber@chromium.org>
Date: Wed Jun 14 08:24:24 2017

Fix metric for new CBD dialog

A bug is fixed where "ClearBrowsingData_DialogCreated" was recorded
twice because the new CBD dialog creates two instances of
ClearBrowsingDataPreferences.

(cherry picked from http://crrev.com/2927063002 with everything but
 this bugfix reverted)

BUG= 731120 
TBR=twellington@chromium.org

Review-Url: https://codereview.chromium.org/2927063002
Cr-Original-Commit-Position: refs/heads/master@{#478602}
Review-Url: https://codereview.chromium.org/2940823002 .
Cr-Commit-Position: refs/branch-heads/3112@{#341}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

[modify] https://crrev.com/69601320533e89949caa6cb3a05b63ff4804da59/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java
[modify] https://crrev.com/69601320533e89949caa6cb3a05b63ff4804da59/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataTabsFragment.java

Thanks! I merged the bugfix