[Do not commit] Track revocations in content_settings::Observer

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/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_)->AddObserver(this);
 }
 
 PermissionManager::~PermissionManager() {
   if (!subscriptions_.IsEmpty())
     HostContentSettingsMapFactory::GetForProfile(profile_)
         ->RemoveObserver(this);
 }
 
 int PermissionManager::RequestPermission(
     PermissionType permission,
@@ skipping 133 matching lines @@
       requesting_origin,
       embedding_origin,
       PermissionTypeToContentSetting(permission));
 }
 
 int PermissionManager::SubscribePermissionStatusChange(
     PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
     const base::Callback<void(PermissionStatus)>& callback) {
-  if (subscriptions_.IsEmpty())
-    HostContentSettingsMapFactory::GetForProfile(profile_)->AddObserver(this);
 
   Subscription* subscription = new Subscription();
   subscription->permission = permission;
   subscription->requesting_origin = requesting_origin;
   subscription->embedding_origin = embedding_origin;
   subscription->callback = callback;
 
   if (IsConstantPermission(permission)) {
     subscription->current_value = GetContentSettingForConstantPermission(
         permission);
   } else {
     subscription->current_value = PermissionContext::Get(profile_, permission)
         ->GetPermissionStatus(subscription->requesting_origin,
                               subscription->embedding_origin);
   }
 
   return subscriptions_.Add(subscription);
 }
 
 void PermissionManager::UnsubscribePermissionStatusChange(int subscription_id) {
   // Whether |subscription_id| is known will be checked by the Remove() call.
   subscriptions_.Remove(subscription_id);
-
-  if (subscriptions_.IsEmpty())
-    HostContentSettingsMapFactory::GetForProfile(profile_)
-        ->RemoveObserver(this);
 }
 
 bool PermissionManager::IsPermissionBubbleManagerMissing(
     content::WebContents* web_contents) {
   // TODO(felt): Remove this method entirely. Leaving it to make a minimal
   // last-minute merge to 46. See crbug.com/457091 and crbug.com/534631.
   return false;
 }
 
 void PermissionManager::OnContentSettingChanged(
     const ContentSettingsPattern& primary_pattern,
     const ContentSettingsPattern& secondary_pattern,
     ContentSettingsType content_type,
+    ContentSetting previous_value,
     std::string resource_identifier) {
   std::list<base::Closure> callbacks;
 
+  PermissionUmaUtil::OnContentsettingChanged(profile_, primary_pattern,
+                                             secondary_pattern, content_type,
+                                             previous_value);
+
   for (SubscriptionsMap::iterator iter(&subscriptions_);
        !iter.IsAtEnd(); iter.Advance()) {
     Subscription* subscription = iter.GetCurrentValue();
     if (PermissionTypeToContentSetting(subscription->permission) !=
         content_type) {
       continue;
     }
 
     if (primary_pattern.IsValid() &&
         !primary_pattern.Matches(subscription->requesting_origin))
@@ skipping 14 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();
 }