Only log ClearBrowsingData_Cookies for normal Browser

All the other ClearBrowsingData_* metrics are logged
when the user clear them using the clear browsing data
screen.
ClearBrowsingData_Cookies is the only one that is also
log when destroying an incognito browser, leading to
metrics inconsistencies.

Only log ClearBrowsingData_Cookies for normal browser
fix the issue.

Bug: 1132818
Change-Id: I169d474b326fd1d53885524ab584000336768d46
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2434338Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Mohammad Refaat <mrefaat@chromium.org>
Commit-Queue: Olivier Robin <olivierrobin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811777}

ios/chrome/browser/browsing_data/browsing_data_remover_impl.mm

@@ -295,7 +295,11 @@ void BrowsingDataRemoverImpl::RemoveImpl(base::Time delete_begin,
       web::WebThread::IO, base::TaskShutdownBehavior::BLOCK_SHUTDOWN};
 
   if (IsRemoveDataMaskSet(mask, BrowsingDataRemoveMask::REMOVE_COOKIES)) {
-    base::RecordAction(base::UserMetricsAction("ClearBrowsingData_Cookies"));
+    if (!browser_state_->IsOffTheRecord()) {
+      // ClearBrowsingData_Cookies should not be reported when cookies are
+      // cleared as part of an incognito browser shutdown.
+      base::RecordAction(base::UserMetricsAction("ClearBrowsingData_Cookies"));
+    }
     net::CookieDeletionInfo::TimeRange deletion_time_range =
         net::CookieDeletionInfo::TimeRange(delete_begin, delete_end);
     base::PostTask(