Index: chrome/browser/plugins/flash_permission_context.cc |
diff --git a/chrome/browser/plugins/flash_permission_context.cc b/chrome/browser/plugins/flash_permission_context.cc |
index bb782a621a22d9bcc0f26811c8e46b7f3ff71df6..f3a80481b80a60b0c54bff7b22233699c6bf3392 100644 |
--- a/chrome/browser/plugins/flash_permission_context.cc |
+++ b/chrome/browser/plugins/flash_permission_context.cc |
@@ -13,6 +13,7 @@ |
#include "content/public/browser/navigation_controller.h" |
#include "content/public/browser/render_frame_host.h" |
#include "content/public/browser/web_contents.h" |
+#include "url/origin.h" |
FlashPermissionContext::FlashPermissionContext(Profile* profile) |
: PermissionContextBase(profile, |
@@ -25,8 +26,8 @@ ContentSetting FlashPermissionContext::GetPermissionStatus( |
const GURL& requesting_origin, |
const GURL& embedding_origin) const { |
ContentSetting flash_setting = PluginUtils::GetFlashPluginContentSetting( |
- HostContentSettingsMapFactory::GetForProfile(profile()), embedding_origin, |
- requesting_origin, nullptr); |
+ HostContentSettingsMapFactory::GetForProfile(profile()), |
+ url::Origin(embedding_origin), requesting_origin, nullptr); |
flash_setting = PluginsFieldTrial::EffectiveContentSetting( |
CONTENT_SETTINGS_TYPE_PLUGINS, flash_setting); |
if (flash_setting == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT) |