Content Settings: Add RevocationObserver to measure when permissions are revoked

chrome/browser/permissions/permission_manager.cc

 // Copyright 2015 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_manager.h"
 
 #include <stddef.h>
 
 #include "base/callback.h"
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/permissions/permission_context.h"
 #include "chrome/browser/permissions/permission_context_base.h"
 #include "chrome/browser/permissions/permission_request_id.h"
+#include "chrome/browser/permissions/permission_uma_util.h"
+#include "chrome/browser/permissions/permission_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/permission_type.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
@@ skipping 166 matching lines @@
   PermissionType permission;
   GURL requesting_origin;
   GURL embedding_origin;
   base::Callback<void(PermissionStatus)> callback;
   ContentSetting current_value;
 };
 
 PermissionManager::PermissionManager(Profile* profile)
     : profile_(profile),
       weak_ptr_factory_(this) {
+  HostContentSettingsMapFactory::GetForProfile(profile_)->AddRevocationObserver(
+      this);
 }
 
 PermissionManager::~PermissionManager() {
+  HostContentSettingsMap* map =
+      HostContentSettingsMapFactory::GetForProfile(profile_);
+  map->RemoveRevocationObserver(this);
   if (!subscriptions_.IsEmpty())
-    HostContentSettingsMapFactory::GetForProfile(profile_)
-        ->RemoveObserver(this);
+    map->RemoveObserver(this);
 }
 
 int PermissionManager::RequestPermission(
     PermissionType permission,
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
     const base::Callback<void(PermissionStatus)>& callback) {
   return RequestPermissions(
       std::vector<PermissionType>(1, permission),
       render_frame_host,
@@ skipping 205 matching lines @@
     // Add the callback to |callbacks| which will be run after the loop to
     // prevent re-entrance issues.
     callbacks.push_back(
         base::Bind(subscription->callback,
                    ContentSettingToPermissionStatus(new_value)));
   }
 
   for (const auto& callback : callbacks)
     callback.Run();
 }
+
+void PermissionManager::OnContentSettingRevoked(
+    const GURL& primary_url,
+    const GURL& secondary_url,
+    ContentSettingsType content_type,
+    std::string resource_identifier) {
+  PermissionType permission_type;
+  if (PermissionUtil::GetPermissionType(content_type, &permission_type)) {

[raymes, 2016/03/17 02:05:43]

nit: no {}

[tsergeant, 2016/03/17 06:25:40]

Done.

+    PermissionUmaUtil::PermissionRevoked(permission_type, primary_url);

[kcarattini, 2016/03/17 02:51:22]

Is going to change how often revocation is reported? How about adding a comment
on the RAPPOR metric with the date of the reporting change release, that way we
won't mistake it for a change in user behaviour?

[tsergeant, 2016/03/17 06:25:40]

Good idea, done.

+  }
+}