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 cba2d992c2e7fa046ffe656267104bfd8046c1f5..cbb77bf0727e2b6b19593ac2fd64d0f1f3f57a71 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" |
@@ -423,7 +422,8 @@ bool MediaCaptureDevicesDispatcher::CheckMediaAccessPermission( |
security_origin, |
security_origin, |
contentSettingsType, |
- NO_RESOURCE_IDENTIFIER) == CONTENT_SETTING_ALLOW) { |
+ content_settings::ResourceIdentifier()) == |
+ CONTENT_SETTING_ALLOW) { |
perkj_chrome
2015/04/08 10:51:15
is it clang format that does this? git cl format?
|
return true; |
} |
@@ -469,7 +469,8 @@ bool MediaCaptureDevicesDispatcher::CheckMediaAccessPermission( |
security_origin, |
security_origin, |
contentSettingsType, |
- NO_RESOURCE_IDENTIFIER) == CONTENT_SETTING_ALLOW) { |
+ content_settings::ResourceIdentifier()) == |
+ CONTENT_SETTING_ALLOW) { |
return true; |
} |