Update to Chromium version 102.0.5005.0 (#992738)

Linux: 32-bit x86 builds are no longer supported (see issue #2676).
This commit is contained in:
Marshall Greenblatt
2022-04-27 15:24:24 -04:00
parent 916360e2e5
commit b62dd2b6ee
38 changed files with 170 additions and 152 deletions

View File

@ -125,10 +125,10 @@ index 8b72897491669..546919dd70afc 100644
// that the X-Frame-Options protection mechanism is set to either DENY or
// SAMEORIGIN.
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
index 7a096b1c69de4..08a5142af028b 100644
index abfb11349c9ee..10d7d16a48d56 100644
--- chrome/renderer/chrome_content_renderer_client.cc
+++ chrome/renderer/chrome_content_renderer_client.cc
@@ -931,6 +931,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -929,6 +929,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
status == chrome::mojom::PluginStatus::kBlocked) &&
@ -136,7 +136,7 @@ index 7a096b1c69de4..08a5142af028b 100644
content_settings_agent_delegate->IsPluginTemporarilyAllowed(
identifier)) {
status = chrome::mojom::PluginStatus::kAllowed;
@@ -1132,7 +1133,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1130,7 +1131,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
plugin_auth_host.BindNewEndpointAndPassReceiver());
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@ -146,7 +146,7 @@ index 7a096b1c69de4..08a5142af028b 100644
break;
}
case chrome::mojom::PluginStatus::kBlocked: {
@@ -1141,7 +1143,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1139,7 +1141,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
placeholder->AllowLoading();
RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
@ -156,7 +156,7 @@ index 7a096b1c69de4..08a5142af028b 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
@@ -1151,7 +1154,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1149,7 +1152,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
group_name));
RenderThread::Get()->RecordAction(
UserMetricsAction("Plugin_BlockedByPolicy"));
@ -166,7 +166,7 @@ index 7a096b1c69de4..08a5142af028b 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedNoLoading: {
@@ -1159,7 +1163,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1157,7 +1161,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
IDR_BLOCKED_PLUGIN_HTML,
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
group_name));