Implement permission embargo suppression metrics.

chrome/browser/permissions/permission_queue_controller.cc

 // Copyright 2013 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/permissions/permission_queue_controller.h"
 
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ skipping 203 matching lines @@
                                                 const GURL& embedder,
                                                 bool user_gesture,
                                                 bool update_content_setting,
                                                 PermissionAction decision) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   PermissionRequestType request_type =
       PermissionUtil::GetRequestType(content_settings_type_);
   PermissionRequestGestureType gesture_type =
       PermissionUtil::GetGestureType(user_gesture);
+  PermissionEmbargoStatus embargo_status =
+      PermissionEmbargoStatus::NOT_EMBARGOED;
+
   switch (decision) {
     case GRANTED:
       PermissionUmaUtil::PermissionGranted(content_settings_type_, gesture_type,
                                            requesting_frame, profile_);
       PermissionUmaUtil::RecordPermissionPromptAccepted(request_type,
                                                         gesture_type);
-      PermissionUmaUtil::RecordPermissionEmbargoStatus(
-          PermissionEmbargoStatus::NOT_EMBARGOED);
       break;
     case DENIED:
       PermissionUmaUtil::PermissionDenied(content_settings_type_, gesture_type,
                                           requesting_frame, profile_);
       PermissionUmaUtil::RecordPermissionPromptDenied(request_type,
                                                       gesture_type);
-      PermissionUmaUtil::RecordPermissionEmbargoStatus(
-          PermissionEmbargoStatus::NOT_EMBARGOED);
       break;
     case DISMISSED:
       PermissionUmaUtil::PermissionDismissed(
           content_settings_type_, gesture_type, requesting_frame, profile_);
       if (PermissionDecisionAutoBlocker::GetForProfile(profile_)
               ->RecordDismissAndEmbargo(requesting_frame,
                                         content_settings_type_)) {
-        PermissionUmaUtil::RecordPermissionEmbargoStatus(
-            PermissionEmbargoStatus::REPEATED_DISMISSALS);
-      } else {
-        PermissionUmaUtil::RecordPermissionEmbargoStatus(
-            PermissionEmbargoStatus::NOT_EMBARGOED);
+        embargo_status = PermissionEmbargoStatus::REPEATED_DISMISSALS;
       }
       break;
     default:
       NOTREACHED();
   }
+  PermissionUmaUtil::RecordEmbargoStatus(embargo_status);
 
   // TODO(miguelg): move the permission persistence to
   // PermissionContextBase once all the types are moved there.
   if (update_content_setting)
     UpdateContentSetting(requesting_frame, embedder, decision);
 
   // Cancel this request first, then notify listeners.  TODO(pkasting): Why
   // is this order important?
   PendingInfobarRequests requests_to_notify;
   PendingInfobarRequests infobars_to_remove;
@@ skipping 183 matching lines @@
   // TODO(timloh): Remove this logic when push and notification permissions
   // are reconciled, see crbug.com/563297.
   ContentSettingsType type_for_map = content_settings_type_;
   if (type_for_map == CONTENT_SETTINGS_TYPE_PUSH_MESSAGING)
     type_for_map = CONTENT_SETTINGS_TYPE_NOTIFICATIONS;
   HostContentSettingsMapFactory::GetForProfile(profile_)
       ->SetContentSettingDefaultScope(
           requesting_frame.GetOrigin(), embedder.GetOrigin(),
           type_for_map, std::string(), content_setting);
 }