| Index: chrome/browser/content_settings/tab_specific_content_settings.cc
|
| diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc
|
| index f843210c27dda758bb97ca0087e721d616341d9c..68c7f857b545681635bea038b28cfbccf5ef7559 100644
|
| --- a/chrome/browser/content_settings/tab_specific_content_settings.cc
|
| +++ b/chrome/browser/content_settings/tab_specific_content_settings.cc
|
| @@ -249,8 +249,7 @@ bool TabSpecificContentSettings::IsContentBlocked(
|
| content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA ||
|
| content_type == CONTENT_SETTINGS_TYPE_PPAPI_BROKER ||
|
| content_type == CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS ||
|
| - content_type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX ||
|
| - content_type == CONTENT_SETTINGS_TYPE_KEYGEN) {
|
| + content_type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX) {
|
| const auto& it = content_settings_status_.find(content_type);
|
| if (it != content_settings_status_.end())
|
| return it->second.blocked;
|
| @@ -540,16 +539,6 @@ void TabSpecificContentSettings::OnGeolocationPermissionSet(
|
| content::NotificationService::NoDetails());
|
| }
|
|
|
| -void TabSpecificContentSettings::OnDidUseKeygen(const GURL& origin_url) {
|
| - HostContentSettingsMap* map = HostContentSettingsMapFactory::GetForProfile(
|
| - Profile::FromBrowserContext(web_contents()->GetBrowserContext()));
|
| - GURL url = web_contents()->GetLastCommittedURL();
|
| - if (map->GetContentSetting(url, url, CONTENT_SETTINGS_TYPE_KEYGEN,
|
| - std::string()) != CONTENT_SETTING_ALLOW) {
|
| - OnContentBlocked(CONTENT_SETTINGS_TYPE_KEYGEN);
|
| - }
|
| -}
|
| -
|
| #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
|
| void TabSpecificContentSettings::OnProtectedMediaIdentifierPermissionSet(
|
| const GURL& requesting_origin,
|
| @@ -792,7 +781,6 @@ bool TabSpecificContentSettings::OnMessageReceived(
|
| IPC_BEGIN_MESSAGE_MAP(TabSpecificContentSettings, message)
|
| IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ContentBlocked,
|
| OnContentBlockedWithDetail)
|
| - IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DidUseKeygen, OnDidUseKeygen)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
| return handled;
|
|
|