Convert AutoBlocker static class to KeyedService.

chrome/browser/permissions/permission_util.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_util.h"
 
 #include "build/build_config.h"
 #include "base/feature_list.h"
 #include "base/logging.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/common/chrome_features.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/permission_type.h"
 
 using content::PermissionType;
 
 std::size_t PermissionTypeHash::operator()(
     const content::PermissionType& type) const {
   return static_cast<size_t>(type);
 }
 
 // The returned strings must match the RAPPOR metrics in rappor.xml,
 // and any Field Trial configs for the Permissions kill switch e.g.
 // Permissions.Action.Geolocation etc..
 std::string PermissionUtil::GetPermissionString(
     content::PermissionType permission) {
   switch (permission) {
     case content::PermissionType::GEOLOCATION:
-      return "Geolocation";
+      return kGeolocationPermissionName;
     case content::PermissionType::NOTIFICATIONS:
-      return "Notifications";
+      return kNotificationPermissionName;
     case content::PermissionType::MIDI_SYSEX:
-      return "MidiSysEx";
+      return kMidiSysExnPermissionName;
     case content::PermissionType::PUSH_MESSAGING:
-      return "PushMessaging";
+      return kPushMessagingPermissionName;
     case content::PermissionType::DURABLE_STORAGE:
-      return "DurableStorage";
+      return kDurableStoragePermissionName;
     case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
-      return "ProtectedMediaIdentifier";
+      return kProtectedMediaPermissionName;
     case content::PermissionType::AUDIO_CAPTURE:
-      return "AudioCapture";
+      return kAudioCapturePermissionName;
     case content::PermissionType::VIDEO_CAPTURE:
-      return "VideoCapture";
+      return kVideoCapturePermissionName;
     case content::PermissionType::MIDI:
-      return "Midi";
+      return kMidiPermissionName;
     case content::PermissionType::BACKGROUND_SYNC:
-      return "BackgroundSync";
+      return kBackgroundSyncPermissionName;
     case content::PermissionType::FLASH:
-      return "Flash";
+      return kFlashPermissionName;
     case content::PermissionType::NUM:
       break;
   }
   NOTREACHED();
   return std::string();
 }
 
+content::PermissionType PermissionUtil::ConvertSafeBrowsingNameToPermissionType(
+    const std::string& sb_name) {
+  if (sb_name == "GEOLOCATION")

[raymes, 2017/01/24 05:15:17]

nit: please make a note that the name is a stringified version of the enum

[meredithl, 2017/01/24 23:20:21]

I've now changed this method around so there is no sb_name, and updated the
comment in the header. Is that okay?

+    return content::PermissionType::GEOLOCATION;
+  if (sb_name == "NOTIFICATIONS")
+    return content::PermissionType::NOTIFICATIONS;
+  if (sb_name == "MIDI_SYSEX")
+    return content::PermissionType::MIDI_SYSEX;
+  if (sb_name == "PUSH_MESSAGING")
+    return content::PermissionType::PUSH_MESSAGING;
+  if (sb_name == "DURABLE_STORAGE")
+    return content::PermissionType::DURABLE_STORAGE;
+  if (sb_name == "PROTECTED_MEDIA_IDENTIFIER")
+    return content::PermissionType::PROTECTED_MEDIA_IDENTIFIER;
+  if (sb_name == "AUDIO_CAPTURE")
+    return content::PermissionType::AUDIO_CAPTURE;
+  if (sb_name == "VIDEO_CAPTURE")
+    return content::PermissionType::MIDI;
+  if (sb_name == "MIDI")
+    return content::PermissionType::MIDI;
+  if (sb_name == "BACKGROUND_SYNC")
+    return content::PermissionType::BACKGROUND_SYNC;
+  if (sb_name == "FLASH")
+    return content::PermissionType::FLASH;
+  NOTREACHED();
+  return content::PermissionType::NUM;
+}
+
 PermissionRequestType PermissionUtil::GetRequestType(
     content::PermissionType type) {
   switch (type) {
     case content::PermissionType::GEOLOCATION:
       return PermissionRequestType::PERMISSION_GEOLOCATION;
     case content::PermissionType::NOTIFICATIONS:
       return PermissionRequestType::PERMISSION_NOTIFICATIONS;
     case content::PermissionType::MIDI_SYSEX:
       return PermissionRequestType::PERMISSION_MIDI_SYSEX;
     case content::PermissionType::PUSH_MESSAGING:
@@ skipping 90 matching lines @@
   ContentSetting final_content_setting = settings_map->GetContentSetting(
       primary_url_, secondary_url_, content_type_, std::string());
   if (final_content_setting != CONTENT_SETTING_ALLOW) {
     PermissionType permission_type;
     if (PermissionUtil::GetPermissionType(content_type_, &permission_type)) {
       PermissionUmaUtil::PermissionRevoked(permission_type, source_ui_,
                                            primary_url_, profile_);
     }
   }
 }