Index: chrome/browser/permissions/permission_context_base.cc |
diff --git a/chrome/browser/permissions/permission_context_base.cc b/chrome/browser/permissions/permission_context_base.cc |
index 6719a923c6da49f0d7374c0cccc9fd104ff5ead8..85744db632eeddf5e4316084ec4f66adb5adc5da 100644 |
--- a/chrome/browser/permissions/permission_context_base.cc |
+++ b/chrome/browser/permissions/permission_context_base.cc |
@@ -122,9 +122,9 @@ |
} |
ContentSetting PermissionContextBase::GetPermissionStatus( |
- HostContentSettingsMap* host, |
const GURL& requesting_origin, |
const GURL& embedding_origin) const { |
+ |
// If the permission has been disabled through Finch, block all requests. |
if (IsPermissionKillSwitchOn()) |
return CONTENT_SETTING_BLOCK; |
@@ -134,16 +134,9 @@ |
return CONTENT_SETTING_BLOCK; |
} |
- return host->GetContentSetting(requesting_origin, embedding_origin, |
- content_settings_type_, std::string()); |
-} |
- |
-ContentSetting PermissionContextBase::GetPermissionStatus( |
- const GURL& requesting_origin, |
- const GURL& embedding_origin) const { |
- HostContentSettingsMap* host = |
- HostContentSettingsMapFactory::GetForProfile(profile_); |
- return GetPermissionStatus(host, requesting_origin, embedding_origin); |
+ return HostContentSettingsMapFactory::GetForProfile(profile_) |
+ ->GetContentSetting(requesting_origin, embedding_origin, |
+ content_settings_type_, std::string()); |
} |
void PermissionContextBase::ResetPermission( |