Add UMA for autoblocking and embargoing.

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 94 matching lines @@
              << " is not supported in popups)";
     NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
                         false /* persist */, CONTENT_SETTING_BLOCK);
     return;
   }
 
   // Synchronously check the content setting to see if the user has already made
   // a decision, or if the origin is under embargo. If so, respect that
   // decision.
   ContentSetting content_setting =
       GetPermissionStatus(requesting_origin, embedding_origin);

[raymes, 2017/02/03 19:56:20]

I think we want to record that it was embargoed here, if the reason it was
blocked is due to embargo.

   if (content_setting == CONTENT_SETTING_ALLOW) {
     HostContentSettingsMapFactory::GetForProfile(profile_)->UpdateLastUsage(
         requesting_origin, embedding_origin, content_settings_type_);
   }
 
   if (content_setting == CONTENT_SETTING_ALLOW ||
       content_setting == CONTENT_SETTING_BLOCK) {
     NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
                         false /* persist */, content_setting);
     return;
@@ skipping 10 matching lines @@
                  requesting_origin, embedding_origin, user_gesture, callback));
 }
 
 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) {

[raymes, 2017/02/03 19:56:20]

If we pass in the reason for the permission being blocked here, we can record
the metric at this layer. Basically we would just add the metric recording into
the if (permission_blocked) case below
  

   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.
     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);
 }
 
 ContentSetting PermissionContextBase::GetPermissionStatus(
     const GURL& requesting_origin,
     const GURL& embedding_origin) const {

[raymes, 2017/02/03 19:56:20]

I think we might want to have a version of this function which returns a denial
reason.

   // If the permission has been disabled through Finch, block all requests.
   if (IsPermissionKillSwitchOn())
     return CONTENT_SETTING_BLOCK;
 
   if (IsRestrictedToSecureOrigins() &&
       !content::IsOriginSecure(requesting_origin)) {
     return CONTENT_SETTING_BLOCK;
   }
 
   ContentSetting content_setting =
@@ skipping 128 matching lines @@
       PermissionUmaUtil::PermissionDismissed(permission_type_, gesture_type,
                                              requesting_origin, profile_);
     }
   }
 
   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;

[raymes, 2017/02/03 19:56:20]

This is slightly orthogonal to this CL, but I think we can just remove this line
and rework this into:
if (content_setting == CONTENT_SETTING_DEFAULT)
  PermissionUmaUtil::RecordPermissionEmbargoReason

+  } else {
+    // If a decision was made, and it did not exceed the number of allowable
+    // dismissals, then it cannot have been embargoed.
+    PermissionUmaUtil::RecordPermissionEmbargoReason(
+        PermissionEmbargoReason::NOT_EMBARGOED);
   }
 
   NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
                       persist, content_setting);
 }
 
 #if defined(OS_ANDROID)
 PermissionQueueController* PermissionContextBase::GetQueueController() {
   return permission_queue_controller_.get();
 }
@@ skipping 38 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);
 }