Update to Chromium version 107.0.5304.29

This commit is contained in:
Marshall Greenblatt
2022-10-07 14:27:57 +00:00
committed by Marshall Greenblatt
parent 92f0b8a971
commit e2ebe99118
6 changed files with 21 additions and 21 deletions

View File

@@ -198,7 +198,7 @@ index 791b74ef57995..20cd406ff81bb 100644
+#endif
}
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index 6f268f5937bd5..2152a26496ceb 100644
index 52e08d175a0a3..5e2511dfd3e8e 100644
--- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc
@@ -31,6 +31,7 @@
@@ -260,7 +260,7 @@ index 6f268f5937bd5..2152a26496ceb 100644
}
std::vector<base::FilePath>
@@ -6623,10 +6635,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
@@ -6625,10 +6637,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
const auto now = base::TimeTicks::Now();
const auto timeout = GetKeepaliveTimerTimeout(context);
keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
@@ -273,7 +273,7 @@ index 6f268f5937bd5..2152a26496ceb 100644
FROM_HERE, keepalive_deadline_ - now,
base::BindOnce(
&ChromeContentBrowserClient::OnKeepaliveTimerFired,
@@ -6645,7 +6657,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
@@ -6647,7 +6659,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
--num_keepalive_requests_;
if (num_keepalive_requests_ == 0) {
DVLOG(1) << "Stopping the keepalive timer";
@@ -283,7 +283,7 @@ index 6f268f5937bd5..2152a26496ceb 100644
// This deletes the keep alive handle attached to the timer function and
// unblock the shutdown sequence.
}
@@ -6777,7 +6790,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
@@ -6779,7 +6792,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
const auto now = base::TimeTicks::Now();
const auto then = keepalive_deadline_;
if (now < then) {
@@ -324,7 +324,7 @@ index cb93058f317e4..27215441c206c 100644
#endif
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
index 5b8477a22f9a0..e80b94c8822d5 100644
index bcdc111b9168a..a78f8696530d0 100644
--- chrome/browser/prefs/browser_prefs.cc
+++ chrome/browser/prefs/browser_prefs.cc
@@ -11,6 +11,7 @@