Collect user metrics for clearing protected storage

chrome/browser/browsing_data_remover.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browsing_data_remover.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 171 matching lines @@
 
 void BrowsingDataRemover::RemoveImpl(int remove_mask,
                                      const GURL& origin,
                                      int origin_set_mask) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   set_removing(true);
   remove_mask_ = 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);
     if (history_service) {
       std::set<GURL> restrict_urls;
       if (!remove_origin_.is_empty())
         restrict_urls.insert(remove_origin_);
       content::RecordAction(UserMetricsAction("ClearBrowsingData_History"));
       waiting_for_clear_history_ = true;
       history_service->ExpireHistoryBetween(restrict_urls,
@@ skipping 580 matching lines @@
       BrowserThread::UI, FROM_HERE,
       base::Bind(&BrowsingDataRemover::OnClearedServerBoundCerts,
                  base::Unretained(this)));
 }
 
 void BrowsingDataRemover::OnClearedServerBoundCerts() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   waiting_for_clear_server_bound_certs_ = false;
   NotifyAndDeleteIfDone();
 }