Add revocation metrics from OIB and content setting

chrome/browser/ui/webui/options/content_settings_handler.cc

 // Copyright (c) 2012 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/ui/webui/options/content_settings_handler.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 12 matching lines @@
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/content_settings/web_site_settings_uma_util.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/browser/notifications/desktop_notification_profile_util.h"
 #include "chrome/browser/permissions/chooser_context_base.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/ui/browser_list.h"
 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
 #include "chrome/browser/ui/webui/site_settings_helper.h"
 #include "chrome/browser/usb/usb_chooser_context.h"
 #include "chrome/browser/usb/usb_chooser_context_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/common/features.h"
 #include "chrome/common/pref_names.h"
@@ skipping 1257 matching lines @@
   std::string secondary_pattern;
   if (args->GetSize() >= 4U) {
     rv = args->GetString(3, &secondary_pattern);
     DCHECK(rv);
   }
 
   HostContentSettingsMap* settings_map =
       mode == "normal" ? GetContentSettingsMap() :
                          GetOTRContentSettingsMap();
   if (settings_map) {
+    ContentSettingsPattern secondary_content_setting_pattern =
+        secondary_pattern.empty()
+            ? ContentSettingsPattern::Wildcard()
+            : ContentSettingsPattern::FromString(secondary_pattern);
+    PermissionUtil::ScopedRevocationReporter scoped_revocation_reporter(
+        Profile::FromWebUI(web_ui()),
+        ContentSettingsPattern::FromString(pattern),
+        secondary_content_setting_pattern, type,
+        PermissionSourceUI::SITE_SETTINGS);
+    scoped_revocation_reporter.SetCustomSettingsMap(settings_map);

[raymes, 2016/07/26 01:18:31]

I think we should just pass the OTR profile into the ScopedRevocationReporter -
see profile->GetOffTheRecordProfile(). In fact we don't report changes to the
OTR profile (see PermissionUmaUtil::IsOptedIntoPermissionActionReporting), so
it's important that we pass the right profile or we will send reports when we
shouldn't. 

[stefanocs, 2016/07/26 02:16:20]

Done.

+
     settings_map->SetContentSettingCustomScope(
         ContentSettingsPattern::FromString(pattern),

[raymes, 2016/07/26 01:18:31]

Can we pull this out above and have 

ContentSettingsPattern primary_pattern = ...
ContentSettingsPattern secondary_pattern = ...

[stefanocs, 2016/07/26 02:16:20]

Done.

-        secondary_pattern.empty()
-            ? ContentSettingsPattern::Wildcard()
-            : ContentSettingsPattern::FromString(secondary_pattern),
-        type, std::string(), CONTENT_SETTING_DEFAULT);
+        secondary_content_setting_pattern, type, std::string(),
+        CONTENT_SETTING_DEFAULT);
   }
 }
 
 void ContentSettingsHandler::RemoveZoomLevelException(
     const base::ListValue* args) {
   std::string mode;
   bool rv = args->GetString(1, &mode);
   DCHECK(rv);
 
   std::string pattern;
@@ skipping 149 matching lines @@
     // The settings map could be null if the mode was OTR but the OTR profile
     // got destroyed before we received this message.
     if (!settings_map)
       return;
 
     ContentSetting setting_type;
     bool result =
         content_settings::ContentSettingFromString(setting, &setting_type);
     DCHECK(result);
 
+    PermissionUtil::ScopedRevocationReporter scoped_revocation_reporter(
+        Profile::FromWebUI(web_ui()),
+        ContentSettingsPattern::FromString(pattern),
+        ContentSettingsPattern::Wildcard(), type,
+        PermissionSourceUI::SITE_SETTINGS);
+    scoped_revocation_reporter.SetCustomSettingsMap(settings_map);
+
     settings_map->SetContentSettingCustomScope(
         ContentSettingsPattern::FromString(pattern),
         ContentSettingsPattern::Wildcard(), type, std::string(), setting_type);
     WebSiteSettingsUmaUtil::LogPermissionChange(type, setting_type);
   }
 }
 
 void ContentSettingsHandler::CheckExceptionPatternValidity(
     const base::ListValue* args) {
   std::string type_string;
@@ skipping 150 matching lines @@
 
   // Exceptions apply only when the feature is enabled.
   PrefService* prefs = user_prefs::UserPrefs::Get(GetBrowserContext(web_ui()));
   bool enable_exceptions = prefs->GetBoolean(prefs::kEnableDRM);
   web_ui()->CallJavascriptFunctionUnsafe(
       "ContentSettings.enableProtectedContentExceptions",
       base::FundamentalValue(enable_exceptions));
 }
 
 }  // namespace options