Skip to content

Commit

Permalink
Update to Chromium 116.0.5845.110
Browse files Browse the repository at this point in the history
  • Loading branch information
PF4Public committed Aug 23, 2023
1 parent 2d25d53 commit 21e4a63
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 17 deletions.
2 changes: 1 addition & 1 deletion chromium_version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
116.0.5845.97
116.0.5845.110
1 change: 1 addition & 0 deletions domain_substitution.list
Original file line number Diff line number Diff line change
Expand Up @@ -13545,6 +13545,7 @@ tools/gn/src/base/memory/scoped_refptr.h
tools/gn/src/base/values.h
tools/gn/src/base/win/registry.cc
tools/gn/src/base/win/registry.h
tools/gn/src/gn/args.cc
tools/gn/src/gn/command_gen.cc
tools/gn/src/gn/compile_commands_writer.h
tools/gn/src/gn/standard_out.cc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -764,15 +764,15 @@

if (safe_browsing_mode != 0) {
# "Safe Browsing Basic" files used for safe browsing in full mode
@@ -515,6 +517,7 @@ static_library("advanced_protection") {
@@ -516,6 +518,7 @@ static_library("advanced_protection") {
}

source_set("metrics_collector") {
+ if (false) {
sources = [
"safe_browsing_metrics_collector_factory.cc",
"safe_browsing_metrics_collector_factory.h",
@@ -534,6 +537,7 @@ source_set("metrics_collector") {
@@ -535,6 +538,7 @@ source_set("metrics_collector") {
"//components/safe_browsing/core/common:safe_browsing_prefs",
"//content/public/browser",
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
"//third_party/blink/renderer/modules/eyedropper",
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -3918,12 +3918,6 @@
@@ -3920,12 +3920,6 @@
base_feature: "none",
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3972,35 +3972,53 @@

--- a/components/safe_browsing/core/browser/db/v4_local_database_manager.cc
+++ b/components/safe_browsing/core/browser/db/v4_local_database_manager.cc
@@ -346,10 +346,9 @@ const V4LocalDatabaseManager*
@@ -346,12 +346,9 @@ const V4LocalDatabaseManager*
scoped_refptr<V4LocalDatabaseManager> V4LocalDatabaseManager::Create(
const base::FilePath& base_path,
scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
- scoped_refptr<base::SequencedTaskRunner> io_task_runner,
- ExtendedReportingLevelCallback extended_reporting_level_callback) {
- ExtendedReportingLevelCallback extended_reporting_level_callback,
- RecordMigrationMetricsCallback record_migration_metrics_callback) {
+ scoped_refptr<base::SequencedTaskRunner> io_task_runner) {
return base::WrapRefCounted(new V4LocalDatabaseManager(
- base_path, extended_reporting_level_callback, std::move(ui_task_runner),
- base_path, extended_reporting_level_callback,
- std::move(record_migration_metrics_callback), std::move(ui_task_runner),
+ base_path, std::move(ui_task_runner),
std::move(io_task_runner), nullptr));
}

@@ -372,14 +371,12 @@ void V4LocalDatabaseManager::CollectData
@@ -374,17 +371,12 @@ void V4LocalDatabaseManager::CollectData

V4LocalDatabaseManager::V4LocalDatabaseManager(
const base::FilePath& base_path,
- ExtendedReportingLevelCallback extended_reporting_level_callback,
- RecordMigrationMetricsCallback record_migration_metrics_callback,
scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
scoped_refptr<base::SequencedTaskRunner> io_task_runner,
scoped_refptr<base::SequencedTaskRunner> task_runner_for_tests)
: SafeBrowsingDatabaseManager(std::move(ui_task_runner),
std::move(io_task_runner)),
base_path_(base_path),
- extended_reporting_level_callback_(extended_reporting_level_callback),
- record_migration_metrics_callback_(
- std::move(record_migration_metrics_callback)),
list_infos_(GetListInfos()),
task_runner_(task_runner_for_tests
? task_runner_for_tests
@@ -1277,8 +1274,7 @@ void V4LocalDatabaseManager::SetupUpdate
@@ -709,12 +701,6 @@ void V4LocalDatabaseManager::DatabaseRea
v4_database_ = std::move(v4_database);

v4_database_->RecordFileSizeHistograms();
- if (record_migration_metrics_callback_) {
- ui_task_runner()->PostTask(
- FROM_HERE,
- base::BindOnce(std::move(record_migration_metrics_callback_),
- v4_database_->GetMigrateResult()));
- }

PopulateArtificialDatabase();

@@ -1288,8 +1274,7 @@ void V4LocalDatabaseManager::SetupUpdate
weak_factory_.GetWeakPtr());

v4_update_protocol_manager_ = V4UpdateProtocolManager::Create(
Expand All @@ -4012,31 +4030,36 @@
void V4LocalDatabaseManager::UpdateRequestCompleted(
--- a/components/safe_browsing/core/browser/db/v4_local_database_manager.h
+++ b/components/safe_browsing/core/browser/db/v4_local_database_manager.h
@@ -39,8 +39,7 @@ class V4LocalDatabaseManager : public Sa
@@ -42,9 +42,7 @@ class V4LocalDatabaseManager : public Sa
static scoped_refptr<V4LocalDatabaseManager> Create(
const base::FilePath& base_path,
scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
- scoped_refptr<base::SequencedTaskRunner> io_task_runner,
- ExtendedReportingLevelCallback extended_reporting_level_callback);
- ExtendedReportingLevelCallback extended_reporting_level_callback,
- RecordMigrationMetricsCallback record_migration_metrics_callback);
+ scoped_refptr<base::SequencedTaskRunner> io_task_runner);

V4LocalDatabaseManager(const V4LocalDatabaseManager&) = delete;
V4LocalDatabaseManager& operator=(const V4LocalDatabaseManager&) = delete;
@@ -112,7 +111,6 @@ class V4LocalDatabaseManager : public Sa
@@ -116,8 +114,6 @@ class V4LocalDatabaseManager : public Sa
// Must be initialized by calling StartOnSBThread() before using.
V4LocalDatabaseManager(
const base::FilePath& base_path,
- ExtendedReportingLevelCallback extended_reporting_level_callback,
- RecordMigrationMetricsCallback record_migration_metrics_callback,
scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
scoped_refptr<base::SequencedTaskRunner> io_task_runner,
scoped_refptr<base::SequencedTaskRunner> task_runner_for_tests);
@@ -430,10 +428,6 @@ class V4LocalDatabaseManager : public Sa
@@ -435,13 +431,6 @@ class V4LocalDatabaseManager : public Sa
// ready to process next update.
DatabaseUpdatedCallback db_updated_callback_;

- // Callback to get the current extended reporting level. Needed by the update
- // manager.
- ExtendedReportingLevelCallback extended_reporting_level_callback_;
-
- // Callback to record metrics on database migration after initialization.
- RecordMigrationMetricsCallback record_migration_metrics_callback_;
-
// The client_state of each list currently being synced. This is updated each
// time a database update completes, and used to send list client_state
Expand Down Expand Up @@ -5976,15 +5999,15 @@
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -106134,7 +106134,6 @@ Full version information for the fingerp
@@ -106139,7 +106139,6 @@ Full version information for the fingerp
<int value="3" label="kRestoreOnStartup"/>
<int value="4" label="kURLsToRestoreOnStartup"/>
<int value="5" label="extensions::pref_names::kExtensions"/>
- <int value="6" label="kGoogleServicesLastUsername"/>
<int value="7" label="kSearchProviderOverrides"/>
<int value="8" label="kDefaultSearchProviderSearchURL (Obsolete 12/2016)"/>
<int value="9" label="kDefaultSearchProviderKeyword (Obsolete 12/2016)"/>
@@ -106149,10 +106148,7 @@ Full version information for the fingerp
@@ -106154,10 +106153,7 @@ Full version information for the fingerp
<int value="18" label="kSafeBrowsingIncidentsSent"/>
<int value="19" label="kSwReporterPromptVersion"/>
<int value="20" label="kSwReporterPromptReason"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
} // namespace blink
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1787,6 +1787,12 @@
@@ -1789,6 +1789,12 @@
origin_trial_feature_name: "Focusgroup",
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ approach to change color components.
// Methods overridden by all sub-classes
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1793,6 +1793,9 @@
@@ -1795,6 +1795,9 @@
name: "FingerprintingCanvasMeasureTextNoise",
},
{
Expand Down

0 comments on commit 21e4a63

Please sign in to comment.