Collect user metrics for clearing protected storage

chrome/browser/browsing_data_remover.cc

Index: chrome/browser/browsing_data_remover.cc
diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc
index 81d4b936b8f906a6ace1e04b0c1766ad00b1a987..1edb5ed213e092ada304029656f05740deb1cd47 100644
--- a/chrome/browser/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data_remover.cc
@@ -189,6 +189,26 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask,
   remove_origin_ = origin;
   origin_set_mask_ = origin_set_mask;
 
+  if (origin_set_mask_ & BrowsingDataHelper::UNPROTECTED_WEB) {
+    content::RecordAction(
+        UserMetricsAction("ClearBrowsingData_MaskContainsUnprotectedWeb"));
+  }
+  if (origin_set_mask_ & BrowsingDataHelper::PROTECTED_WEB) {
+    content::RecordAction(
+        UserMetricsAction("ClearBrowsingData_MaskContainsProtectedWeb"));
+  }
+  if (origin_set_mask_ & BrowsingDataHelper::EXTENSION) {
+    content::RecordAction(
+        UserMetricsAction("ClearBrowsingData_MaskContainsExtension"));
+  }
+  // If this fires, we added a new BrowsingDataHelper::OriginSetMask without
+  // updating the user metrics above.
+  COMPILE_ASSERT(
+      BrowsingDataHelper::ALL == (BrowsingDataHelper::UNPROTECTED_WEB |
+                                  BrowsingDataHelper::PROTECTED_WEB |
+                                  BrowsingDataHelper::EXTENSION),
+      forgotten_to_add_origin_mask_type);

[Mike West, 2012/06/14 08:32:39]

Nit: We have at least two kinds of masks in BDR, so "...origin_set_mask..." and
"OriginSetMask", just for consistency and clarity.

[battre, 2012/06/14 09:24:52]

Can't do that because UserMetricsAction(...) needs to fit into one line to be
discovered by a RegEx.

+
   if (remove_mask & REMOVE_HISTORY) {
     HistoryService* history_service =
         profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);