Update to Chromium version 101.0.4951.0 (#982481)

Known issues:
- chrome: Some ceftests are failing due to bfcache same-site enabled by default
  (see issue #3301)
This commit is contained in:
Marshall Greenblatt
2022-03-25 21:12:30 -04:00
parent 77466e7b6d
commit b524edc209
100 changed files with 591 additions and 671 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 34d8a9b2ff94e..fe67d6b068bf6 100644
index bbac287647477..3179dc62bf1d2 100644
--- chrome/renderer/chrome_content_renderer_client.cc
+++ chrome/renderer/chrome_content_renderer_client.cc
@@ -926,6 +926,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -920,6 +920,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
status == chrome::mojom::PluginStatus::kBlocked) &&
@ -136,7 +136,7 @@ index 34d8a9b2ff94e..fe67d6b068bf6 100644
content_settings_agent_delegate->IsPluginTemporarilyAllowed(
identifier)) {
status = chrome::mojom::PluginStatus::kAllowed;
@@ -1127,7 +1128,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1121,7 +1122,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
plugin_auth_host.BindNewEndpointAndPassReceiver());
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@ -146,7 +146,7 @@ index 34d8a9b2ff94e..fe67d6b068bf6 100644
break;
}
case chrome::mojom::PluginStatus::kBlocked: {
@@ -1136,7 +1138,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1130,7 +1132,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 34d8a9b2ff94e..fe67d6b068bf6 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
@@ -1146,7 +1149,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1140,7 +1143,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
group_name));
RenderThread::Get()->RecordAction(
UserMetricsAction("Plugin_BlockedByPolicy"));
@ -166,7 +166,7 @@ index 34d8a9b2ff94e..fe67d6b068bf6 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedNoLoading: {
@@ -1154,7 +1158,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1148,7 +1152,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
IDR_BLOCKED_PLUGIN_HTML,
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
group_name));