| 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 941edbb2d2b36710139fbb330bb3b6594ad963c0..7efcd0e780a414dd172c55aa20ec541000d83d05 100644
|
| --- a/chrome/browser/plugins/flash_permission_context.cc
|
| +++ b/chrome/browser/plugins/flash_permission_context.cc
|
| @@ -12,6 +12,7 @@
|
| #include "chrome/browser/ui/website_settings/website_settings_infobar_delegate.h"
|
| #include "components/content_settings/core/browser/host_content_settings_map.h"
|
| #include "content/public/browser/render_frame_host.h"
|
| +#include "url/origin.h"
|
|
|
| FlashPermissionContext::FlashPermissionContext(Profile* profile)
|
| : PermissionContextBase(profile,
|
| @@ -24,8 +25,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)
|
|
|