[MD settings] UMA and RevocationReporter in site settings

chrome/browser/ui/webui/settings/site_settings_handler.cc

 // Copyright 2016 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/settings/site_settings_handler.h"
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/i18n/number_formatting.h"
 #include "base/macros.h"
 #include "base/values.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.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/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/webui/site_settings_helper.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/crx_file/id_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_ui.h"
@@ skipping 415 matching lines @@
         map, content_type, extension_registry, web_ui(), /*incognito=*/true,
         /*filter=*/nullptr, exceptions.get());
   }
 
   ResolveJavascriptCallback(*callback_id, *exceptions.get());
 }
 
 void SiteSettingsHandler::HandleResetCategoryPermissionForOrigin(
     const base::ListValue* args) {
   CHECK_EQ(4U, args->GetSize());
-  std::string primary_pattern;
-  CHECK(args->GetString(0, &primary_pattern));
-  std::string secondary_pattern;
-  CHECK(args->GetString(1, &secondary_pattern));
+  std::string primary_pattern_string;
+  CHECK(args->GetString(0, &primary_pattern_string));
+  std::string secondary_pattern_string;
+  CHECK(args->GetString(1, &secondary_pattern_string));
   std::string type;
   CHECK(args->GetString(2, &type));
   bool incognito;
   CHECK(args->GetBoolean(3, &incognito));
 
   ContentSettingsType content_type =
       static_cast<ContentSettingsType>(static_cast<int>(
           site_settings::ContentSettingsTypeFromGroupName(type)));
 
   Profile* profile = nullptr;
   if (incognito) {
     if (!profile_->HasOffTheRecordProfile())
       return;
     profile = profile_->GetOffTheRecordProfile();
   } else {
     profile = profile_;
   }
 
   HostContentSettingsMap* map =
       HostContentSettingsMapFactory::GetForProfile(profile);
-  map->SetContentSettingCustomScope(
-      ContentSettingsPattern::FromString(primary_pattern),
-      secondary_pattern.empty() ?
-          ContentSettingsPattern::Wildcard() :
-          ContentSettingsPattern::FromString(secondary_pattern),
-      content_type, "", CONTENT_SETTING_DEFAULT);
+
+  ContentSettingsPattern primary_pattern =
+      ContentSettingsPattern::FromString(primary_pattern_string);
+  ContentSettingsPattern secondary_pattern =
+      secondary_pattern_string.empty()
+          ? ContentSettingsPattern::Wildcard()
+          : ContentSettingsPattern::FromString(secondary_pattern_string);
+  PermissionUtil::ScopedRevocationReporter scoped_revocation_reporter(
+      profile, primary_pattern, secondary_pattern, content_type,
+      PermissionSourceUI::SITE_SETTINGS);
+
+  map->SetContentSettingCustomScope(primary_pattern, secondary_pattern,
+                                    content_type, "", CONTENT_SETTING_DEFAULT);
+
+  WebSiteSettingsUmaUtil::LogPermissionChange(
+      content_type, ContentSetting::CONTENT_SETTING_DEFAULT);
 }
 
 void SiteSettingsHandler::HandleSetCategoryPermissionForOrigin(
     const base::ListValue* args) {
   CHECK_EQ(5U, args->GetSize());
-  std::string primary_pattern;
-  CHECK(args->GetString(0, &primary_pattern));
-  std::string secondary_pattern;
-  CHECK(args->GetString(1, &secondary_pattern));
+  std::string primary_pattern_string;
+  CHECK(args->GetString(0, &primary_pattern_string));
+  // TODO(dschuyler): |secondary_pattern_unused| is not used, remove it.

[Dan Beam, 2017/05/04 19:37:45]

why did the old code use it but the new one doesn't need to?

[dschuyler, 2017/05/04 21:09:21]

The reasoning was based on the JS sending an empty string for this parameter. 

Though this doesn't need to be changed as part of this patch, so I've replaced
the use of secondary pattern here and changed the todo.

+  std::string secondary_pattern_unused;
+  CHECK(args->GetString(1, &secondary_pattern_unused));
   std::string type;
   CHECK(args->GetString(2, &type));
   std::string value;
   CHECK(args->GetString(3, &value));
   bool incognito;
   CHECK(args->GetBoolean(4, &incognito));
 
   ContentSettingsType content_type =
       static_cast<ContentSettingsType>(static_cast<int>(
           site_settings::ContentSettingsTypeFromGroupName(type)));
   ContentSetting setting;
   CHECK(content_settings::ContentSettingFromString(value, &setting));
 
   Profile* profile = nullptr;
   if (incognito) {
     if (!profile_->HasOffTheRecordProfile())
       return;
     profile = profile_->GetOffTheRecordProfile();
   } else {
     profile = profile_;
   }
 
   HostContentSettingsMap* map =
       HostContentSettingsMapFactory::GetForProfile(profile);
-  map->SetContentSettingCustomScope(
-      ContentSettingsPattern::FromString(primary_pattern),
-      secondary_pattern.empty() ?
-          ContentSettingsPattern::Wildcard() :
-          ContentSettingsPattern::FromString(secondary_pattern),
-      content_type, "", setting);
+
+  ContentSettingsPattern primary_pattern =
+      ContentSettingsPattern::FromString(primary_pattern_string);
+
+  PermissionUtil::ScopedRevocationReporter scoped_revocation_reporter(
+      profile, primary_pattern, ContentSettingsPattern::Wildcard(),
+      content_type, PermissionSourceUI::SITE_SETTINGS);
+
+  map->SetContentSettingCustomScope(primary_pattern,
+                                    ContentSettingsPattern::Wildcard(),
+                                    content_type, "", setting);
+
+  WebSiteSettingsUmaUtil::LogPermissionChange(content_type, setting);
 }
 
 void SiteSettingsHandler::HandleGetSiteDetails(
     const base::ListValue* args) {
   AllowJavascript();
 
   CHECK_EQ(2U, args->GetSize());
   const base::Value* callback_id;
   CHECK(args->Get(0, &callback_id));
   std::string site;
@@ skipping 191 matching lines @@
     origin = content::kUnreachableWebDataURL;
   }
 
   content::HostZoomMap* host_zoom_map;
   host_zoom_map = content::HostZoomMap::GetDefaultForBrowserContext(profile_);
   double default_level = host_zoom_map->GetDefaultZoomLevel();
   host_zoom_map->SetZoomLevelForHost(origin, default_level);
 }
 
 }  // namespace settings