Update to Chromium version 87.0.4280.88

This commit is contained in:
Marshall Greenblatt
2020-12-07 21:22:20 -05:00
parent 8bb770500e
commit 03f933676a
8 changed files with 20 additions and 20 deletions

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/plugins/plugin_info_host_impl.cc chrome/browser/plugins/plugin_info_host_impl.cc
index d789ee040ac5..19e5a5daa343 100644
index 19de17320066..1dfba315226f 100644
--- chrome/browser/plugins/plugin_info_host_impl.cc
+++ chrome/browser/plugins/plugin_info_host_impl.cc
@@ -18,6 +18,7 @@
@@ -82,7 +82,7 @@ index d789ee040ac5..19e5a5daa343 100644
if (security_status == PluginMetadata::SECURITY_STATUS_FULLY_TRUSTED) {
*status = chrome::mojom::PluginStatus::kAllowed;
return;
@@ -337,17 +360,41 @@ bool PluginInfoHostImpl::Context::FindEnabledPlugin(
@@ -346,17 +369,41 @@ bool PluginInfoHostImpl::Context::FindEnabledPlugin(
return false;
}
@@ -197,7 +197,7 @@ index c1870b0f56ef..d32b8d54fb3f 100644
GURL webstore_url(extension_urls::GetWebstoreLaunchURL());
if (response_url.SchemeIsHTTPOrHTTPS() &&
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
index c9852764a59c..ffe26ef879b9 100644
index ce09634902a5..de9cc70a61e2 100644
--- chrome/renderer/chrome_content_renderer_client.cc
+++ chrome/renderer/chrome_content_renderer_client.cc
@@ -825,6 +825,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -208,7 +208,7 @@ index c9852764a59c..ffe26ef879b9 100644
content_settings_agent_delegate->IsPluginTemporarilyAllowed(
identifier)) {
status = chrome::mojom::PluginStatus::kAllowed;
@@ -1028,7 +1029,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1041,7 +1042,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
plugin_auth_host.BindNewEndpointAndPassReceiver());
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@@ -218,7 +218,7 @@ index c9852764a59c..ffe26ef879b9 100644
break;
}
case chrome::mojom::PluginStatus::kBlocked: {
@@ -1037,7 +1039,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1050,7 +1052,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
placeholder->AllowLoading();
RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
@@ -228,7 +228,7 @@ index c9852764a59c..ffe26ef879b9 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
@@ -1047,7 +1050,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1060,7 +1063,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
group_name));
RenderThread::Get()->RecordAction(
UserMetricsAction("Plugin_BlockedByPolicy"));
@@ -238,7 +238,7 @@ index c9852764a59c..ffe26ef879b9 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedNoLoading: {
@@ -1055,7 +1059,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1068,7 +1072,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
IDR_BLOCKED_PLUGIN_HTML,
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
group_name));