mirror of
https://github.com/morgan9e/helium
synced 2026-04-14 00:14:20 +09:00
Update to Chromium 132.0.6834.110
This commit is contained in:
@@ -1 +1 @@
|
||||
132.0.6834.83
|
||||
132.0.6834.110
|
||||
|
||||
@@ -5055,7 +5055,7 @@
|
||||
}
|
||||
|
||||
void SafeBrowsingMetricsCollector::LogMetricsAndScheduleNextLogging() {
|
||||
@@ -91,80 +74,10 @@ void SafeBrowsingMetricsCollector::LogMe
|
||||
@@ -91,77 +74,10 @@ void SafeBrowsingMetricsCollector::LogMe
|
||||
MaybeLogDailyEsbProtegoPingSent();
|
||||
RemoveOldEventsFromPref();
|
||||
|
||||
@@ -5065,6 +5065,26 @@
|
||||
ScheduleNextLoggingAfterInterval(base::Days(kMetricsLoggingIntervalDay));
|
||||
}
|
||||
|
||||
-safe_browsing::SafeBrowsingMetricsCollector::ProtegoPingType
|
||||
-SafeBrowsingMetricsCollector::GetMostRecentPingType(
|
||||
- base::Time last_ping_with_token,
|
||||
- base::Time last_ping_without_token,
|
||||
- base::TimeDelta time_delta) {
|
||||
- // If a ping with token was sent within the last time_delta,
|
||||
- // the most recent ping type is kWithToken.
|
||||
- // If both last_ping_with_token and last_ping_without_token are present,
|
||||
- // we log kWithToken instead of kWithoutToken because if a token has been
|
||||
- // sent before, we are certain that this account is a signed in account
|
||||
- // and the server has received the token.
|
||||
- // The kWithoutToken ping could be sent after the account logged out.
|
||||
- if (base::Time::Now() - last_ping_with_token < time_delta) {
|
||||
- return ProtegoPingType::kWithToken;
|
||||
- } else if (base::Time::Now() - last_ping_without_token < time_delta) {
|
||||
- return ProtegoPingType::kWithoutToken;
|
||||
- }
|
||||
- return ProtegoPingType::kNone;
|
||||
-}
|
||||
-
|
||||
void SafeBrowsingMetricsCollector::MaybeLogDailyEsbProtegoPingSent() {
|
||||
- if (GetSafeBrowsingState(*pref_service_) !=
|
||||
- SafeBrowsingState::ENHANCED_PROTECTION) {
|
||||
@@ -5086,57 +5106,34 @@
|
||||
-
|
||||
- bool sent_ping_since_last_collector_run =
|
||||
- most_recent_ping_time > most_recent_collector_run_time;
|
||||
-
|
||||
- auto logged_ping_type = ProtegoPingType::kNone;
|
||||
-
|
||||
- if (base::Time::Now() - last_ping_with_token < base::Hours(24)) {
|
||||
- // If a ping with token was sent within the last 24 hours,
|
||||
- // the most recent ping type is kWithToken.
|
||||
- // If both last_ping_with_token and last_ping_without_token are present,
|
||||
- // we log kWithToken instead of kWithoutToken because if a token has been
|
||||
- // sent before, we are certain that this account is a signed in account
|
||||
- // and the server has received the token.
|
||||
- // The kWithoutToken ping could be sent after the account logged out.
|
||||
- logged_ping_type = ProtegoPingType::kWithToken;
|
||||
- } else if (base::Time::Now() - last_ping_without_token < base::Hours(24)) {
|
||||
- // If no ping with token was sent but a ping without token was sent within
|
||||
- // the last 24 hours, the most recent ping type is kWithoutToken.
|
||||
- // Otherwise, it is the default value, kNone.
|
||||
- logged_ping_type = ProtegoPingType::kWithoutToken;
|
||||
- }
|
||||
- base::UmaHistogramEnumeration(
|
||||
- "SafeBrowsing.Enhanced.ProtegoRequestSentInLast24Hours",
|
||||
- sent_ping_since_last_collector_run ? most_recent_ping_type
|
||||
- : ProtegoPingType::kNone);
|
||||
-
|
||||
- auto logged_ping_last_24_hours_type = GetMostRecentPingType(
|
||||
- last_ping_with_token, last_ping_without_token, base::Hours(24));
|
||||
- base::UmaHistogramEnumeration(
|
||||
- "SafeBrowsing.Enhanced.ProtegoRequestSentInLast24Hours2",
|
||||
- logged_ping_type);
|
||||
- logged_ping_last_24_hours_type);
|
||||
-
|
||||
- auto logged_ping_last_7_days_type = ProtegoPingType::kNone;
|
||||
- if (base::Time::Now() - last_ping_with_token < base::Days(7)) {
|
||||
- // If a ping with token was sent within the last 7 days,
|
||||
- // the most recent ping type is kWithToken.
|
||||
- // If both last_ping_with_token and last_ping_without_token are present,
|
||||
- // we log kWithToken instead of kWithoutToken because if a token has been
|
||||
- // sent before, we are certain that this account is a signed in account
|
||||
- // and the server has received the token.
|
||||
- // The kWithoutToken ping could be sent after the account logged out.
|
||||
- logged_ping_last_7_days_type = ProtegoPingType::kWithToken;
|
||||
- } else if (base::Time::Now() - last_ping_without_token < base::Days(7)) {
|
||||
- // If no ping with token was sent but a ping without token was sent within
|
||||
- // the last 7 days, the most recent ping type is kWithoutToken.
|
||||
- // Otherwise, it is the default value, kNone.
|
||||
- logged_ping_last_7_days_type = ProtegoPingType::kWithoutToken;
|
||||
- }
|
||||
- auto logged_ping_last_7_days_type = GetMostRecentPingType(
|
||||
- last_ping_with_token, last_ping_without_token, base::Days(7));
|
||||
-
|
||||
- base::UmaHistogramEnumeration(
|
||||
- "SafeBrowsing.Enhanced.ProtegoRequestSentInLast7Days",
|
||||
- logged_ping_last_7_days_type);
|
||||
-
|
||||
- auto logged_ping_last_28_days_type = GetMostRecentPingType(
|
||||
- last_ping_with_token, last_ping_without_token, base::Days(28));
|
||||
-
|
||||
- base::UmaHistogramEnumeration(
|
||||
- "SafeBrowsing.Enhanced.ProtegoRequestSentInLast28Days",
|
||||
- logged_ping_last_28_days_type);
|
||||
}
|
||||
|
||||
void SafeBrowsingMetricsCollector::ScheduleNextLoggingAfterInterval(
|
||||
@@ -176,75 +89,16 @@ void SafeBrowsingMetricsCollector::Sched
|
||||
@@ -173,75 +89,16 @@ void SafeBrowsingMetricsCollector::Sched
|
||||
}
|
||||
|
||||
void SafeBrowsingMetricsCollector::LogDailyOptInMetrics() {
|
||||
@@ -5212,7 +5209,7 @@
|
||||
}
|
||||
|
||||
void SafeBrowsingMetricsCollector::AddBypassEventToPref(
|
||||
@@ -287,15 +141,7 @@ std::optional<base::Time> SafeBrowsingMe
|
||||
@@ -284,15 +141,7 @@ std::optional<base::Time> SafeBrowsingMe
|
||||
std::optional<base::Time> SafeBrowsingMetricsCollector::GetLatestEventTimestamp(
|
||||
EventTypeFilter event_type_filter) {
|
||||
// Events are not logged when Safe Browsing is disabled.
|
||||
@@ -5228,7 +5225,7 @@
|
||||
}
|
||||
|
||||
std::optional<base::Time>
|
||||
@@ -307,45 +153,15 @@ SafeBrowsingMetricsCollector::GetLatestS
|
||||
@@ -304,45 +153,15 @@ SafeBrowsingMetricsCollector::GetLatestS
|
||||
void SafeBrowsingMetricsCollector::AddSafeBrowsingEventAndUserStateToPref(
|
||||
UserState user_state,
|
||||
EventType event_type) {
|
||||
@@ -5275,7 +5272,7 @@
|
||||
}
|
||||
|
||||
std::optional<SafeBrowsingMetricsCollector::Event>
|
||||
@@ -472,22 +288,6 @@ int SafeBrowsingMetricsCollector::GetEve
|
||||
@@ -469,22 +288,6 @@ int SafeBrowsingMetricsCollector::GetEve
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user