Add UMA for recording embargo reasons and autoblocker interactions.

chrome/browser/permissions/permission_context_base.cc

 // Copyright 2014 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_context_base.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 128 matching lines @@
 void PermissionContextBase::ContinueRequestPermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
     bool user_gesture,
     const BrowserPermissionCallback& callback,
     bool permission_blocked) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (permission_blocked) {
-    // TODO(meredithl): Add UMA metrics here.
     web_contents->GetMainFrame()->AddMessageToConsole(
         content::CONSOLE_MESSAGE_LEVEL_INFO,
         base::StringPrintf(
             "%s permission has been auto-blocked.",
             PermissionUtil::GetPermissionString(permission_type_).c_str()));
     // Permission has been automatically blocked.
+    PermissionUmaUtil::RecordPermissionEmbargoStatus(
+        PermissionEmbargoStatus::PERMISSIONS_BLACKLISTING);
     callback.Run(CONTENT_SETTING_BLOCK);
     return;
   }
 
   PermissionUmaUtil::PermissionRequested(permission_type_, requesting_origin,
                                          embedding_origin, profile_);
 
   DecidePermission(web_contents, id, requesting_origin, embedding_origin,
                    user_gesture, callback);
 }
@@ skipping 128 matching lines @@
     // controller directly.
     PermissionRequestGestureType gesture_type =
         user_gesture ? PermissionRequestGestureType::GESTURE
                      : PermissionRequestGestureType::NO_GESTURE;
     DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
            content_setting == CONTENT_SETTING_BLOCK ||
            content_setting == CONTENT_SETTING_DEFAULT);
     if (content_setting == CONTENT_SETTING_ALLOW) {
       PermissionUmaUtil::PermissionGranted(permission_type_, gesture_type,
                                            requesting_origin, profile_);
+      PermissionUmaUtil::RecordPermissionEmbargoStatus(
+          PermissionEmbargoStatus::NOT_EMBARGOED);
     } else if (content_setting == CONTENT_SETTING_BLOCK) {
       PermissionUmaUtil::PermissionDenied(permission_type_, gesture_type,
                                           requesting_origin, profile_);
+      PermissionUmaUtil::RecordPermissionEmbargoStatus(
+          PermissionEmbargoStatus::NOT_EMBARGOED);
     } else {
       PermissionUmaUtil::PermissionDismissed(permission_type_, gesture_type,
                                              requesting_origin, profile_);
+
+      if (PermissionDecisionAutoBlocker::GetForProfile(profile_)
+              ->RecordDismissAndEmbargo(requesting_origin, permission_type_)) {
+        PermissionUmaUtil::RecordPermissionEmbargoStatus(
+            PermissionEmbargoStatus::REPEATED_DISMISSALS);
+      } else {
+        PermissionUmaUtil::RecordPermissionEmbargoStatus(
+            PermissionEmbargoStatus::NOT_EMBARGOED);
+      }
     }

[rkaplow, 2017/02/13 18:16:21]

this looks like this might be simpler if you just keep a status = 
PermissionEmbargoStatus::NOT_EMBARGOED inside each of these statements

and then a 
PermissionUmaUtil::RecordPermissionEmbargoStatus(status)

at the end, so it's clear there's a single emission

[dominickn, 2017/02/14 01:55:08]

Done, thanks

   }
 
-  if (content_setting == CONTENT_SETTING_DEFAULT &&
-      PermissionDecisionAutoBlocker::GetForProfile(profile_)
-          ->RecordDismissAndEmbargo(requesting_origin, permission_type_)) {
-    // The permission has been embargoed, so it is blocked for this permission
-    // request, but not persisted.
-    content_setting = CONTENT_SETTING_BLOCK;
-  }
-
   NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
                       persist, content_setting);
 }
 
 #if defined(OS_ANDROID)
 PermissionQueueController* PermissionContextBase::GetQueueController() {
   return permission_queue_controller_.get();
 }
 #endif
 
@@ skipping 36 matching lines @@
   DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
          content_setting == CONTENT_SETTING_BLOCK);
   DCHECK(!requesting_origin.SchemeIsFile());
   DCHECK(!embedding_origin.SchemeIsFile());
 
   HostContentSettingsMapFactory::GetForProfile(profile_)
       ->SetContentSettingDefaultScope(requesting_origin, embedding_origin,
                                       content_settings_type_, std::string(),
                                       content_setting);
 }