Skip to content

Commit

Permalink
Update to Chromium 102.0.5005.61 (#1964)
Browse files Browse the repository at this point in the history
  • Loading branch information
Ahrotahn committed May 25, 2022
1 parent d9862af commit 970f6b1
Show file tree
Hide file tree
Showing 59 changed files with 944 additions and 1,052 deletions.
2 changes: 1 addition & 1 deletion chromium_version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
101.0.4951.64
102.0.5005.61
328 changes: 220 additions & 108 deletions domain_substitution.list

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion patches/core/debian/disable/unrar.patch
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ bug: http://bugs.debian.org/914487

--- a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
+++ b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
@@ -97,7 +97,7 @@ void FileAnalyzer::Start(const base::Fil
@@ -96,7 +96,7 @@ void FileAnalyzer::Start(const base::Fil
if (inspection_type == DownloadFileType::ZIP) {
StartExtractZipFeatures();
} else if (inspection_type == DownloadFileType::RAR) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2202,7 +2202,6 @@ static_library("browser") {
@@ -2214,7 +2214,6 @@ static_library("browser") {
"//components/reputation/core:proto",
"//components/resources",
"//components/safe_browsing/content/browser",
- "//components/safe_browsing/content/browser:client_side_detection",
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui",
@@ -3726,8 +3725,6 @@ static_library("browser") {
@@ -3754,8 +3753,6 @@ static_library("browser") {
"download/download_commands.h",
"download/download_crx_util.cc",
"download/download_crx_util.h",
Expand Down Expand Up @@ -42,15 +42,15 @@
virtual subresource_filter::RulesetService*
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -70,7 +70,6 @@
@@ -71,7 +71,6 @@
#include "chrome/browser/printing/print_preview_dialog_controller.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/resource_coordinator/resource_coordinator_parts.h"
-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/shell_integration.h"
#include "chrome/browser/site_isolation/prefs_observer.h"
#include "chrome/browser/ssl/secure_origin_prefs_observer.h"
@@ -391,8 +390,6 @@ void BrowserProcessImpl::StartTearDown()
@@ -394,8 +393,6 @@ void BrowserProcessImpl::StartTearDown()

metrics_services_manager_.reset();
intranet_redirect_detector_.reset();
Expand All @@ -59,7 +59,7 @@
network_time_tracker_.reset();
#if BUILDFLAG(ENABLE_PLUGINS)
plugins_resource_service_.reset();
@@ -1026,14 +1023,6 @@ StatusTray* BrowserProcessImpl::status_t
@@ -1029,14 +1026,6 @@ StatusTray* BrowserProcessImpl::status_t
return status_tray_.get();
}

Expand All @@ -74,7 +74,7 @@
subresource_filter::RulesetService*
BrowserProcessImpl::subresource_filter_ruleset_service() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -1270,26 +1259,6 @@ void BrowserProcessImpl::CreateBackgroun
@@ -1283,26 +1272,6 @@ void BrowserProcessImpl::CreateBackgroun
#endif
}

Expand Down Expand Up @@ -123,15 +123,15 @@
subresource_filter_ruleset_service_;
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -64,7 +64,6 @@
@@ -66,7 +66,6 @@
#include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h"
#include "chrome/browser/profiles/keep_alive/scoped_profile_keep_alive.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/safe_browsing/verdict_cache_manager_factory.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/share/share_history.h"
#include "chrome/browser/share/share_ranking.h"
@@ -613,10 +612,6 @@ void ChromeBrowsingDataRemoverDelegate::
@@ -617,10 +616,6 @@ void ChromeBrowsingDataRemoverDelegate::
base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));

network::mojom::NetworkContext* safe_browsing_context = nullptr;
Expand All @@ -144,7 +144,7 @@
host_content_settings_map_);
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -953,34 +953,6 @@ void SetApplicationLocaleOnIOThread(cons
@@ -959,34 +959,6 @@ void SetApplicationLocaleOnIOThread(cons
GetIOThreadApplicationLocale() = locale;
}

Expand Down Expand Up @@ -179,24 +179,34 @@
#if BUILDFLAG(ENABLE_EXTENSIONS)

AppLoadedInTabSource ClassifyAppLoadedInTabSource(
@@ -1489,7 +1461,6 @@ void ChromeContentBrowserClient::PostAft
@@ -1495,7 +1467,6 @@ void ChromeContentBrowserClient::PostAft
InitNetworkContextsParentDirectory();

DCHECK_CURRENTLY_ON(BrowserThread::UI);
- safe_browsing_service_ = g_browser_process->safe_browsing_service();
}

bool ChromeContentBrowserClient::IsBrowserStartupComplete() {
@@ -4305,7 +4276,7 @@ ChromeContentBrowserClient::CreateThrott
content::WebContents* web_contents = handle->GetWebContents();
throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
handle,
@@ -4290,18 +4261,6 @@ ChromeContentBrowserClient::CreateThrott
throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
handle, handle->GetWebContents()->GetBrowserContext()));

- // Before setting up SSL error detection, configure SSLErrorHandler to invoke
- // the relevant extension API whenever an SSL interstitial is shown.
- SSLErrorHandler::SetClientCallbackOnInterstitialsShown(
- base::BindRepeating(&MaybeTriggerSecurityInterstitialShownEvent));
- content::WebContents* web_contents = handle->GetWebContents();
- throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
- handle,
- std::make_unique<CertificateReportingServiceCertReporter>(web_contents),
+ nullptr,
base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
base::BindOnce(
&ShouldIgnoreSslInterstitialBecauseNavigationDefaultedToHttps)));
@@ -4340,16 +4311,6 @@ ChromeContentBrowserClient::CreateThrott
- base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
- base::BindOnce(
- &ShouldIgnoreSslInterstitialBecauseNavigationDefaultedToHttps)));
-
throttles.push_back(std::make_unique<LoginNavigationThrottle>(handle));

if (base::FeatureList::IsEnabled(omnibox::kDefaultTypedNavigationsToHttps)) {
@@ -4332,16 +4291,6 @@ ChromeContentBrowserClient::CreateThrott
&throttles);
#endif

Expand Down Expand Up @@ -272,7 +282,7 @@
void ChromeDownloadManagerDelegate::SanitizeDownloadParameters(
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -88,7 +88,7 @@ class DownloadItemModelData : public bas
@@ -89,7 +89,7 @@ class DownloadItemModelData : public bas

// Danger level of the file determined based on the file type and whether
// there was a user action associated with the download.
Expand All @@ -281,7 +291,7 @@

// Whether the download is currently being revived.
bool is_being_revived_;
@@ -125,7 +125,7 @@ DownloadItemModelData::DownloadItemModel
@@ -126,7 +126,7 @@ DownloadItemModelData::DownloadItemModel
: should_show_in_shelf_(true),
was_ui_notified_(false),
should_prefer_opening_in_browser_(false),
Expand All @@ -290,7 +300,7 @@
is_being_revived_(false) {}

} // namespace
@@ -399,13 +399,13 @@ void DownloadItemModel::SetShouldPreferO
@@ -417,13 +417,13 @@ void DownloadItemModel::SetShouldPreferO
data->should_prefer_opening_in_browser_ = preference;
}

Expand All @@ -307,7 +317,7 @@
DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
data->danger_level_ = danger_level;
}
@@ -625,9 +625,6 @@ bool DownloadItemModel::IsCommandEnabled
@@ -643,9 +643,6 @@ bool DownloadItemModel::IsCommandEnabled
// filename. Don't base an "Always open" decision based on it. Also
// exclude extensions.
return download_->CanOpenDownload() &&
Expand All @@ -319,7 +329,7 @@
return !download_->IsSavePackageDownload() &&
--- a/chrome/browser/download/download_prefs.cc
+++ b/chrome/browser/download/download_prefs.cc
@@ -251,14 +251,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
@@ -252,14 +252,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) +
extension);

Expand All @@ -335,7 +345,7 @@
}
}

@@ -477,10 +470,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
@@ -479,10 +472,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension(
const base::FilePath& file_name) {
base::FilePath::StringType extension = file_name.Extension();
Expand All @@ -348,7 +358,7 @@
extension.erase(0, 1);
--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
@@ -298,13 +298,6 @@ base::FilePath DownloadTargetDeterminer:
@@ -297,13 +297,6 @@ base::FilePath DownloadTargetDeterminer:
download_->GetURL(), download_->GetContentDisposition(), referrer_charset,
suggested_filename, sniffed_mime_type, default_filename);

Expand All @@ -362,7 +372,7 @@
// If no mime type or explicitly specified a name, don't replace file
// extension.
if (sniffed_mime_type.empty() || !suggested_filename.empty())
@@ -1125,30 +1118,7 @@ DownloadFileType::DangerLevel DownloadTa
@@ -1124,30 +1117,7 @@ DownloadFileType::DangerLevel DownloadTa
download_->HasUserGesture())
return DownloadFileType::NOT_DANGEROUS;

Expand Down Expand Up @@ -404,7 +414,7 @@
#include "chrome/browser/download/download_file_icon_extractor.h"
#include "chrome/browser/download/download_open_prompt.h"
#include "chrome/browser/download/download_prefs.h"
@@ -1276,9 +1275,6 @@ DownloadsAcceptDangerFunction::Downloads
@@ -1277,9 +1276,6 @@ DownloadsAcceptDangerFunction::Downloads

DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}

Expand All @@ -414,7 +424,7 @@
ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
std::unique_ptr<downloads::AcceptDanger::Params> params(
downloads::AcceptDanger::Params::Create(args()));
@@ -1316,42 +1312,7 @@ void DownloadsAcceptDangerFunction::Prom
@@ -1317,42 +1313,7 @@ void DownloadsAcceptDangerFunction::Prom
return;
}
RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
Expand Down Expand Up @@ -539,7 +549,7 @@
referrer_entries)));
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -716,18 +716,6 @@ void WebstorePrivateBeginInstallWithMani
@@ -721,18 +721,6 @@ void WebstorePrivateBeginInstallWithMani

void WebstorePrivateBeginInstallWithManifest3Function::
ReportFrictionAcceptedEvent() {
Expand All @@ -558,7 +568,7 @@
}

void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
@@ -1192,55 +1180,9 @@ WebstorePrivateGetReferrerChainFunction:
@@ -1202,55 +1190,9 @@ WebstorePrivateGetReferrerChainFunction:

ExtensionFunction::ResponseAction
WebstorePrivateGetReferrerChainFunction::Run() {
Expand Down Expand Up @@ -687,7 +697,7 @@
// SimpleURLLoader -> (owned loader, extension id).
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -846,9 +846,6 @@ void ChromeMetricsServiceClient::Registe
@@ -861,9 +861,6 @@ void ChromeMetricsServiceClient::Registe
metrics_service_->RegisterMetricsProvider(
std::make_unique<HttpsEngagementMetricsProvider>());

Expand All @@ -699,7 +709,7 @@
std::make_unique<UpgradeMetricsProvider>());
--- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
+++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
@@ -138,9 +138,6 @@ void TrialComparisonCertVerifierControll
@@ -137,9 +137,6 @@ void TrialComparisonCertVerifierControll
std::string serialized_report;
if (!report.Serialize(&serialized_report))
return;
Expand All @@ -711,7 +721,7 @@
// static
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -319,7 +319,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -324,7 +324,6 @@ void ChromeBrowserMainExtraPartsProfiles
#if BUILDFLAG(IS_CHROMEOS_LACROS)
CertDbInitializerFactory::GetInstance();
#endif
Expand All @@ -721,15 +731,15 @@
#endif
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -93,7 +93,6 @@
@@ -91,7 +91,6 @@
#include "chrome/browser/profiles/profile_metrics.h"
#include "chrome/browser/push_messaging/push_messaging_service_factory.h"
#include "chrome/browser/push_messaging/push_messaging_service_impl.h"
-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/sessions/exit_type_service.h"
#include "chrome/browser/sharing/sharing_service_factory.h"
#include "chrome/browser/signin/identity_manager_factory.h"
@@ -624,17 +623,6 @@ void ProfileImpl::LoadPrefsForNormalStar
@@ -623,17 +622,6 @@ void ProfileImpl::LoadPrefsForNormalStar

mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
pref_validation_delegate;
Expand Down Expand Up @@ -769,23 +779,23 @@
sources = [
"chrome_controller_client.cc",
"chrome_controller_client.h",
@@ -90,6 +91,7 @@ static_library("safe_browsing") {
@@ -91,6 +92,7 @@ static_library("safe_browsing") {
"//extensions/browser",
]
}
+ }

if (safe_browsing_mode != 0) {
# "Safe Browsing Basic" files used for safe browsing in full mode
@@ -451,6 +453,7 @@ static_library("advanced_protection") {
@@ -455,6 +457,7 @@ static_library("advanced_protection") {
}

source_set("metrics_collector") {
+ if (false) {
sources = [
"safe_browsing_metrics_collector_factory.cc",
"safe_browsing_metrics_collector_factory.h",
@@ -468,6 +471,7 @@ source_set("metrics_collector") {
@@ -472,6 +475,7 @@ source_set("metrics_collector") {
"//components/safe_browsing/core/common:safe_browsing_prefs",
"//content/public/browser",
]
Expand Down Expand Up @@ -887,7 +897,7 @@

--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -4171,7 +4171,6 @@ static_library("ui") {
@@ -4219,7 +4219,6 @@ static_library("ui") {
"views/download/bubble/download_dialog_view.h",
"views/download/bubble/download_toolbar_button_view.cc",
"views/download/bubble/download_toolbar_button_view.h",
Expand All @@ -897,7 +907,7 @@
"views/download/download_item_view.cc",
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -368,22 +368,6 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -390,22 +390,6 @@ void TabHelpers::AttachTabHelpers(WebCon
// See https://crbug.com/910288.
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
web_contents);
Expand Down Expand Up @@ -1181,9 +1191,9 @@
html = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -92,7 +92,6 @@
#include "components/page_load_metrics/renderer/metrics_render_frame_observer.h"
@@ -95,7 +95,6 @@
#include "components/paint_preview/buildflags/buildflags.h"
#include "components/password_manager/core/common/password_manager_features.h"
#include "components/safe_browsing/buildflags.h"
-#include "components/safe_browsing/content/renderer/threat_dom_details.h"
#include "components/spellcheck/spellcheck_buildflags.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/components/autofill/core/browser/autofill_download_manager.cc
+++ b/components/autofill/core/browser/autofill_download_manager.cc
@@ -803,94 +803,6 @@ std::tuple<GURL, std::string> AutofillDo
@@ -802,94 +802,6 @@ std::tuple<GURL, std::string> AutofillDo
}

bool AutofillDownloadManager::StartRequest(FormRequestData request_data) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
{
--- a/chrome/browser/extensions/webstore_installer.cc
+++ b/chrome/browser/extensions/webstore_installer.cc
@@ -554,20 +554,6 @@ void WebstoreInstaller::DownloadNextPend
@@ -553,20 +553,6 @@ void WebstoreInstaller::DownloadNextPend
void WebstoreInstaller::DownloadCrx(
const std::string& extension_id,
InstallSource source) {
Expand All @@ -76,7 +76,7 @@
}

// http://crbug.com/165634
@@ -710,21 +696,6 @@ void WebstoreInstaller::UpdateDownloadPr
@@ -709,21 +695,6 @@ void WebstoreInstaller::UpdateDownloadPr
void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!crx_installer_.get());
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/dns/host_resolver_manager.cc
+++ b/net/dns/host_resolver_manager.cc
@@ -152,10 +152,10 @@ const unsigned kMinimumTTLSeconds = kCac
@@ -153,10 +153,10 @@ const unsigned kMinimumTTLSeconds = kCac
// cached.
const int kIPv6ProbePeriodMs = 1000;

Expand Down
11 changes: 0 additions & 11 deletions patches/core/inox-patchset/0017-disable-new-avatar-menu.patch

This file was deleted.

Loading

0 comments on commit 970f6b1

Please sign in to comment.