Skip to content

Commit

Permalink
Update to Chromium 119.0.6045.199
Browse files Browse the repository at this point in the history
  • Loading branch information
Ahrotahn committed Nov 29, 2023
1 parent 0461ff2 commit 3b9e3d3
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 10 deletions.
2 changes: 1 addition & 1 deletion chromium_version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
119.0.6045.159
119.0.6045.199
3 changes: 0 additions & 3 deletions domain_substitution.list
Original file line number Diff line number Diff line change
Expand Up @@ -11749,9 +11749,6 @@ third_party/openscreen/src/test/test_main.cc
third_party/openscreen/src/testing/libfuzzer/BUILD.gn
third_party/openscreen/src/third_party/abseil/BUILD.gn
third_party/openscreen/src/third_party/boringssl/BUILD.gn
third_party/openscreen/src/third_party/mozilla/LICENSE.txt
third_party/openscreen/src/third_party/mozilla/url_parse.cc
third_party/openscreen/src/third_party/mozilla/url_parse.h
third_party/openscreen/src/third_party/protobuf/CHANGES.txt
third_party/openscreen/src/third_party/protobuf/src/google/protobuf/any.cc
third_party/openscreen/src/third_party/protobuf/src/google/protobuf/any.h
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
#include "third_party/blink/public/mojom/feature_observer/feature_observer.mojom.h"
#include "third_party/blink/public/mojom/file/file_utilities.mojom.h"
#include "third_party/blink/public/mojom/file_system_access/file_system_access_manager.mojom.h"
@@ -1140,10 +1139,6 @@ void PopulateBinderMapWithContext(
@@ -1141,10 +1140,6 @@ void PopulateBinderMapWithContext(
map->Add<blink::mojom::BrowsingTopicsDocumentService>(
base::BindRepeating(&BrowsingTopicsDocumentHost::CreateMojoService));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4665,7 +4665,7 @@
}

void SafeBrowsingMetricsCollector::LogMetricsAndScheduleNextLogging() {
@@ -90,38 +73,11 @@ void SafeBrowsingMetricsCollector::LogMe
@@ -90,59 +73,11 @@ void SafeBrowsingMetricsCollector::LogMe
MaybeLogDailyEsbProtegoPingSentLast24Hours();
RemoveOldEventsFromPref();

Expand Down Expand Up @@ -4701,10 +4701,31 @@
- "SafeBrowsing.Enhanced.ProtegoRequestSentInLast24Hours",
- sent_ping_since_last_collector_run ? most_recent_ping_type
- : ProtegoPingType::kNone);
-
- 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.ProtegoRequestSentInLast24Hours2",
- logged_ping_type);
}

void SafeBrowsingMetricsCollector::ScheduleNextLoggingAfterInterval(
@@ -133,76 +89,16 @@ void SafeBrowsingMetricsCollector::Sched
@@ -154,76 +89,16 @@ void SafeBrowsingMetricsCollector::Sched
}

void SafeBrowsingMetricsCollector::LogDailyOptInMetrics() {
Expand Down Expand Up @@ -4781,7 +4802,7 @@
}

void SafeBrowsingMetricsCollector::AddBypassEventToPref(
@@ -245,15 +141,7 @@ absl::optional<base::Time>
@@ -266,15 +141,7 @@ absl::optional<base::Time>
SafeBrowsingMetricsCollector::GetLatestEventTimestamp(
EventTypeFilter event_type_filter) {
// Events are not logged when Safe Browsing is disabled.
Expand All @@ -4797,7 +4818,7 @@
}

absl::optional<base::Time>
@@ -265,45 +153,15 @@ SafeBrowsingMetricsCollector::GetLatestS
@@ -286,45 +153,15 @@ SafeBrowsingMetricsCollector::GetLatestS
void SafeBrowsingMetricsCollector::AddSafeBrowsingEventAndUserStateToPref(
UserState user_state,
EventType event_type) {
Expand Down Expand Up @@ -4844,7 +4865,7 @@
}

absl::optional<SafeBrowsingMetricsCollector::Event>
@@ -431,23 +289,6 @@ int SafeBrowsingMetricsCollector::GetEve
@@ -452,23 +289,6 @@ int SafeBrowsingMetricsCollector::GetEve
});
}

Expand Down

0 comments on commit 3b9e3d3

Please sign in to comment.