Index: chrome/browser/media/media_capture_devices_dispatcher.cc |
diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc |
index ef6127b337e5a3a6aaec44dac7a5c4bee431a59b..b80bc95b06480eb86340639a2ad7ac79f7cdb735 100644 |
--- a/chrome/browser/media/media_capture_devices_dispatcher.cc |
+++ b/chrome/browser/media/media_capture_devices_dispatcher.cc |
@@ -28,7 +28,6 @@ |
#include "chrome/common/chrome_version_info.h" |
#include "chrome/common/pref_names.h" |
#include "chrome/grit/generated_resources.h" |
-#include "components/content_settings/core/browser/content_settings_provider.h" |
#include "components/content_settings/core/browser/host_content_settings_map.h" |
#include "components/pref_registry/pref_registry_syncable.h" |
#include "content/public/browser/browser_thread.h" |
@@ -415,12 +414,12 @@ bool MediaCaptureDevicesDispatcher::CheckMediaAccessPermission( |
// There's no secondary URL for these content types, hence duplicating |
// |security_origin|. |
if (profile->GetHostContentSettingsMap()->GetContentSetting( |
- security_origin, |
- security_origin, |
+ security_origin, security_origin, |
type == content::MEDIA_DEVICE_AUDIO_CAPTURE |
? CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC |
: CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, |
- NO_RESOURCE_IDENTIFIER) == CONTENT_SETTING_ALLOW) { |
+ NoResourceIdentifier::GetResourceIdentifier()) == |
+ CONTENT_SETTING_ALLOW) { |
return true; |
} |
@@ -456,12 +455,12 @@ bool MediaCaptureDevicesDispatcher::CheckMediaAccessPermission( |
// There's no secondary URL for these content types, hence duplicating |
// |security_origin|. |
if (profile->GetHostContentSettingsMap()->GetContentSetting( |
- security_origin, |
- security_origin, |
+ security_origin, security_origin, |
type == content::MEDIA_DEVICE_AUDIO_CAPTURE |
? CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC |
: CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, |
- NO_RESOURCE_IDENTIFIER) == CONTENT_SETTING_ALLOW) { |
+ NoResourceIdentifier::GetResourceIdentifier()) == |
+ CONTENT_SETTING_ALLOW) { |
return true; |
} |