Chromium Code Reviews| Index: chrome/browser/permissions/permission_context_uma_util.cc |
| diff --git a/chrome/browser/permissions/permission_context_uma_util.cc b/chrome/browser/permissions/permission_context_uma_util.cc |
| index 8ed9f8cac4958ca8933e35350334078a1d7210f6..30c1125ae1dc98f10acac3348eb56645b6c2e8d8 100644 |
| --- a/chrome/browser/permissions/permission_context_uma_util.cc |
| +++ b/chrome/browser/permissions/permission_context_uma_util.cc |
| @@ -71,6 +71,11 @@ const std::string GetRapporMetric(ContentSettingsType permission, |
| break; |
| } |
| + // Do not record the deprecated RAPPOR metrics for media permissions. |
| + if (permission == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA || |
| + permission == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) |
| + return ""; |
| + |
| std::string permission_str = |
| PermissionContextUmaUtil::GetPermissionString(permission); |
| if (permission_str.empty()) |
| @@ -134,6 +139,16 @@ void RecordPermissionAction(ContentSettingsType permission, |
| "ContentSettings.PermissionActionsInsecureOrigin_DurableStorage", |
| action); |
| break; |
| + case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC: |
| + // Media permissions are disabled on insecure origins, so there's no |
| + // need to record metrics for secure/insecue. |
| + UMA_HISTOGRAM_ENUMERATION("Permissions.Action_AudioCapture", action, |
| + PERMISSION_ACTION_NUM); |
| + break; |
| + case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA: |
| + UMA_HISTOGRAM_ENUMERATION("Permissions.Action_VideoCapture", action, |
| + PERMISSION_ACTION_NUM); |
| + break; |
| default: |
| NOTREACHED() << "PERMISSION " << permission << " not accounted for"; |
| } |
| @@ -328,9 +343,9 @@ const std::string PermissionContextUmaUtil::GetPermissionString( |
| return "ProtectedMediaIdentifier"; |
| #endif |
| case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC: |
| - return "MediaStreamMic"; |
| + return "AudioCapture"; |
| case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA: |
| - return "MediaStreamCamera"; |
| + return "VideoCapture"; |
|
tsergeant
2015/10/20 06:38:43
Kendra, does it affect you if I change these value
kcarattini
2015/10/21 02:56:55
I'll update my cl to match. Thanks.
|
| default: |
| NOTREACHED(); |
| return ""; |