|
@@ -1,6 +1,6 @@
|
|
|
--- a/chrome/browser/BUILD.gn
|
|
|
+++ b/chrome/browser/BUILD.gn
|
|
|
-@@ -2358,7 +2358,6 @@ static_library("browser") {
|
|
|
+@@ -2352,7 +2352,6 @@ static_library("browser") {
|
|
|
"//components/reporting/util:task_runner_context",
|
|
|
"//components/resources",
|
|
|
"//components/safe_browsing/content/browser",
|
|
@@ -8,7 +8,7 @@
|
|
|
"//components/safe_browsing/content/browser:safe_browsing_service",
|
|
|
"//components/safe_browsing/content/browser/password_protection",
|
|
|
"//components/safe_browsing/content/browser/web_ui",
|
|
|
-@@ -3782,8 +3781,6 @@ static_library("browser") {
|
|
|
+@@ -3744,8 +3743,6 @@ static_library("browser") {
|
|
|
"download/download_commands.h",
|
|
|
"download/download_crx_util.cc",
|
|
|
"download/download_crx_util.h",
|
|
@@ -42,7 +42,7 @@
|
|
|
virtual subresource_filter::RulesetService*
|
|
|
--- a/chrome/browser/browser_process_impl.cc
|
|
|
+++ b/chrome/browser/browser_process_impl.cc
|
|
|
-@@ -71,7 +71,6 @@
|
|
|
+@@ -72,7 +72,6 @@
|
|
|
#include "chrome/browser/printing/print_job_manager.h"
|
|
|
#include "chrome/browser/profiles/profile_manager.h"
|
|
|
#include "chrome/browser/resource_coordinator/resource_coordinator_parts.h"
|
|
@@ -50,7 +50,7 @@
|
|
|
#include "chrome/browser/shell_integration.h"
|
|
|
#include "chrome/browser/site_isolation/prefs_observer.h"
|
|
|
#include "chrome/browser/ssl/secure_origin_prefs_observer.h"
|
|
|
-@@ -440,8 +439,6 @@ void BrowserProcessImpl::StartTearDown()
|
|
|
+@@ -439,8 +438,6 @@ void BrowserProcessImpl::StartTearDown()
|
|
|
#endif
|
|
|
metrics_services_manager_.reset();
|
|
|
intranet_redirect_detector_.reset();
|
|
@@ -59,7 +59,7 @@
|
|
|
network_time_tracker_.reset();
|
|
|
|
|
|
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
|
|
|
-@@ -1088,14 +1085,6 @@ StatusTray* BrowserProcessImpl::status_t
|
|
|
+@@ -1097,14 +1094,6 @@ StatusTray* BrowserProcessImpl::status_t
|
|
|
return status_tray_.get();
|
|
|
}
|
|
|
|
|
@@ -74,7 +74,7 @@
|
|
|
subresource_filter::RulesetService*
|
|
|
BrowserProcessImpl::subresource_filter_ruleset_service() {
|
|
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
-@@ -1344,26 +1333,6 @@ void BrowserProcessImpl::CreateBackgroun
|
|
|
+@@ -1370,26 +1359,6 @@ void BrowserProcessImpl::CreateBackgroun
|
|
|
#endif
|
|
|
}
|
|
|
|
|
@@ -103,7 +103,7 @@
|
|
|
created_subresource_filter_ruleset_service_ = true;
|
|
|
--- a/chrome/browser/browser_process_impl.h
|
|
|
+++ b/chrome/browser/browser_process_impl.h
|
|
|
-@@ -197,7 +197,6 @@ class BrowserProcessImpl : public Browse
|
|
|
+@@ -196,7 +196,6 @@ class BrowserProcessImpl : public Browse
|
|
|
std::unique_ptr<BackgroundModeManager> manager) override;
|
|
|
#endif
|
|
|
StatusTray* status_tray() override;
|
|
@@ -111,7 +111,7 @@
|
|
|
subresource_filter::RulesetService* subresource_filter_ruleset_service()
|
|
|
override;
|
|
|
|
|
|
-@@ -357,9 +356,6 @@ class BrowserProcessImpl : public Browse
|
|
|
+@@ -356,9 +355,6 @@ class BrowserProcessImpl : public Browse
|
|
|
std::unique_ptr<BackgroundModeManager> background_mode_manager_;
|
|
|
#endif
|
|
|
|
|
@@ -131,7 +131,7 @@
|
|
|
#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"
|
|
|
-@@ -633,10 +632,6 @@ void ChromeBrowsingDataRemoverDelegate::
|
|
|
+@@ -635,10 +634,6 @@ void ChromeBrowsingDataRemoverDelegate::
|
|
|
base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
|
|
|
|
|
|
network::mojom::NetworkContext* safe_browsing_context = nullptr;
|
|
@@ -144,42 +144,7 @@
|
|
|
browsing_data::RemoveFederatedSiteSettingsData(delete_begin_, delete_end_,
|
|
|
--- a/chrome/browser/chrome_content_browser_client.cc
|
|
|
+++ b/chrome/browser/chrome_content_browser_client.cc
|
|
|
-@@ -1060,34 +1060,6 @@ void SetApplicationLocaleOnIOThread(cons
|
|
|
- GetIOThreadApplicationLocale() = locale;
|
|
|
- }
|
|
|
-
|
|
|
--// An implementation of the SSLCertReporter interface used by
|
|
|
--// SSLErrorHandler. Uses CertificateReportingService to send reports. The
|
|
|
--// service handles queueing and re-sending of failed reports. Each certificate
|
|
|
--// error creates a new instance of this class.
|
|
|
--class CertificateReportingServiceCertReporter : public SSLCertReporter {
|
|
|
-- public:
|
|
|
-- explicit CertificateReportingServiceCertReporter(
|
|
|
-- content::WebContents* web_contents)
|
|
|
-- : service_(CertificateReportingServiceFactory::GetForBrowserContext(
|
|
|
-- web_contents->GetBrowserContext())) {}
|
|
|
--
|
|
|
-- CertificateReportingServiceCertReporter(
|
|
|
-- const CertificateReportingServiceCertReporter&) = delete;
|
|
|
-- CertificateReportingServiceCertReporter& operator=(
|
|
|
-- const CertificateReportingServiceCertReporter&) = delete;
|
|
|
--
|
|
|
-- ~CertificateReportingServiceCertReporter() override {}
|
|
|
--
|
|
|
-- // SSLCertReporter implementation
|
|
|
-- void ReportInvalidCertificateChain(
|
|
|
-- const std::string& serialized_report) override {
|
|
|
-- service_->Send(serialized_report);
|
|
|
-- }
|
|
|
--
|
|
|
-- private:
|
|
|
-- raw_ptr<CertificateReportingService> service_;
|
|
|
--};
|
|
|
--
|
|
|
- #if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
|
-
|
|
|
- // Returns true if there is is an extension matching `url` in
|
|
|
-@@ -5169,14 +5141,9 @@ ChromeContentBrowserClient::CreateThrott
|
|
|
+@@ -5019,10 +5019,6 @@ ChromeContentBrowserClient::CreateThrott
|
|
|
throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
|
|
|
handle, handle->GetWebContents()->GetBrowserContext()));
|
|
|
|
|
@@ -187,15 +152,10 @@
|
|
|
- // 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)));
|
|
|
-@@ -5222,16 +5189,6 @@ ChromeContentBrowserClient::CreateThrott
|
|
|
+@@ -5070,16 +5066,6 @@ ChromeContentBrowserClient::CreateThrott
|
|
|
&throttles);
|
|
|
#endif
|
|
|
|
|
@@ -212,7 +172,7 @@
|
|
|
if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) {
|
|
|
throttles.push_back(
|
|
|
std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
|
|
|
-@@ -5515,8 +5472,6 @@ void ChromeContentBrowserClient::Overrid
|
|
|
+@@ -5344,8 +5330,6 @@ bool ChromeContentBrowserClient::IsPlugi
|
|
|
void ChromeContentBrowserClient::InitOnUIThread() {
|
|
|
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
|
|
|
@@ -223,12 +183,13 @@
|
|
|
base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
|
|
|
--- a/chrome/browser/component_updater/file_type_policies_component_installer.cc
|
|
|
+++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc
|
|
|
-@@ -38,20 +38,6 @@ const uint8_t kFileTypePoliciesPublicKey
|
|
|
+@@ -38,21 +38,6 @@ const uint8_t kFileTypePoliciesPublicKey
|
|
|
const char kFileTypePoliciesManifestName[] = "File Type Policies";
|
|
|
|
|
|
void LoadFileTypesFromDisk(const base::FilePath& pb_path) {
|
|
|
-- if (pb_path.empty())
|
|
|
+- if (pb_path.empty()) {
|
|
|
- return;
|
|
|
+- }
|
|
|
-
|
|
|
- VLOG(1) << "Reading Download File Types from file: " << pb_path.value();
|
|
|
- std::string binary_pb;
|
|
@@ -246,7 +207,7 @@
|
|
|
} // namespace
|
|
|
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
|
|
|
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
|
|
|
-@@ -474,13 +474,6 @@ void ChromeDownloadManagerDelegate::SetD
|
|
|
+@@ -498,13 +498,6 @@ void ChromeDownloadManagerDelegate::SetD
|
|
|
|
|
|
download_manager_ = dm;
|
|
|
|
|
@@ -260,7 +221,7 @@
|
|
|
if (download_manager_) {
|
|
|
download_manager_->AddObserver(this);
|
|
|
}
|
|
|
-@@ -874,17 +867,6 @@ void ChromeDownloadManagerDelegate::Choo
|
|
|
+@@ -898,17 +891,6 @@ void ChromeDownloadManagerDelegate::Choo
|
|
|
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
|
|
|
base::FilePath* filename,
|
|
|
const GURL& source_url) {
|
|
@@ -280,25 +241,16 @@
|
|
|
void ChromeDownloadManagerDelegate::SanitizeDownloadParameters(
|
|
|
--- a/chrome/browser/download/download_item_model.cc
|
|
|
+++ b/chrome/browser/download/download_item_model.cc
|
|
|
-@@ -109,7 +109,7 @@ class DownloadItemModelData : public bas
|
|
|
+@@ -110,7 +110,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.
|
|
|
-- DownloadFileType::DangerLevel danger_level_;
|
|
|
-+ safe_browsing::DownloadFileType::DangerLevel danger_level_;
|
|
|
+- DownloadFileType::DangerLevel danger_level_ = DownloadFileType::NOT_DANGEROUS;
|
|
|
++ safe_browsing::DownloadFileType::DangerLevel danger_level_ = safe_browsing::DownloadFileType::NOT_DANGEROUS;
|
|
|
|
|
|
// Whether the download is currently being revived.
|
|
|
- bool is_being_revived_;
|
|
|
-@@ -159,7 +159,7 @@ DownloadItemModelData* DownloadItemModel
|
|
|
- DownloadItemModelData::DownloadItemModelData()
|
|
|
- : should_show_in_shelf_(true),
|
|
|
- was_ui_notified_(false),
|
|
|
-- danger_level_(DownloadFileType::NOT_DANGEROUS),
|
|
|
-+ danger_level_(safe_browsing::DownloadFileType::NOT_DANGEROUS),
|
|
|
- is_being_revived_(false) {}
|
|
|
-
|
|
|
- #if BUILDFLAG(FULL_SAFE_BROWSING)
|
|
|
-@@ -535,13 +535,13 @@ void DownloadItemModel::SetShouldPreferO
|
|
|
+ bool is_being_revived_ = false;
|
|
|
+@@ -526,13 +526,13 @@ void DownloadItemModel::SetShouldPreferO
|
|
|
data->should_prefer_opening_in_browser_ = preference;
|
|
|
}
|
|
|
|
|
@@ -315,7 +267,7 @@
|
|
|
DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
|
|
|
data->danger_level_ = danger_level;
|
|
|
}
|
|
|
-@@ -718,9 +718,6 @@ bool DownloadItemModel::IsCommandEnabled
|
|
|
+@@ -709,9 +709,6 @@ bool DownloadItemModel::IsCommandEnabled
|
|
|
// filename. Don't base an "Always open" decision based on it. Also
|
|
|
// exclude extensions.
|
|
|
return download_->CanOpenDownload() &&
|
|
@@ -327,7 +279,7 @@
|
|
|
return !download_->IsSavePackageDownload() &&
|
|
|
--- a/chrome/browser/download/download_prefs.cc
|
|
|
+++ b/chrome/browser/download/download_prefs.cc
|
|
|
-@@ -261,14 +261,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
|
|
|
+@@ -262,14 +262,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
|
|
|
base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) +
|
|
|
extension);
|
|
|
|
|
@@ -356,7 +308,7 @@
|
|
|
extension.erase(0, 1);
|
|
|
--- a/chrome/browser/download/download_target_determiner.cc
|
|
|
+++ b/chrome/browser/download/download_target_determiner.cc
|
|
|
-@@ -323,13 +323,6 @@ base::FilePath DownloadTargetDeterminer:
|
|
|
+@@ -324,13 +324,6 @@ base::FilePath DownloadTargetDeterminer:
|
|
|
download_->GetURL(), download_->GetContentDisposition(), referrer_charset,
|
|
|
suggested_filename, sniffed_mime_type, default_filename);
|
|
|
|
|
@@ -370,7 +322,7 @@
|
|
|
// If no mime type or explicitly specified a name, don't replace file
|
|
|
// extension.
|
|
|
if (sniffed_mime_type.empty() || !suggested_filename.empty())
|
|
|
-@@ -1272,30 +1265,7 @@ DownloadFileType::DangerLevel DownloadTa
|
|
|
+@@ -1287,30 +1280,7 @@ DownloadFileType::DangerLevel DownloadTa
|
|
|
download_->HasUserGesture())
|
|
|
return DownloadFileType::NOT_DANGEROUS;
|
|
|
|
|
@@ -401,10 +353,10 @@
|
|
|
+ return DownloadFileType::NOT_DANGEROUS;
|
|
|
}
|
|
|
|
|
|
- absl::optional<base::Time>
|
|
|
+ std::optional<base::Time>
|
|
|
--- a/chrome/browser/extensions/api/downloads/downloads_api.cc
|
|
|
+++ b/chrome/browser/extensions/api/downloads/downloads_api.cc
|
|
|
-@@ -37,7 +37,6 @@
|
|
|
+@@ -38,7 +38,6 @@
|
|
|
#include "chrome/browser/download/bubble/download_bubble_ui_controller.h"
|
|
|
#include "chrome/browser/download/download_core_service.h"
|
|
|
#include "chrome/browser/download/download_core_service_factory.h"
|
|
@@ -412,7 +364,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"
|
|
|
-@@ -1376,9 +1375,6 @@ DownloadsAcceptDangerFunction::Downloads
|
|
|
+@@ -1377,9 +1376,6 @@ DownloadsAcceptDangerFunction::Downloads
|
|
|
|
|
|
DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
|
|
|
|
|
@@ -420,9 +372,9 @@
|
|
|
- DownloadsAcceptDangerFunction::on_prompt_created_ = nullptr;
|
|
|
-
|
|
|
ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
|
|
|
- absl::optional<downloads::AcceptDanger::Params> params =
|
|
|
+ std::optional<downloads::AcceptDanger::Params> params =
|
|
|
downloads::AcceptDanger::Params::Create(args());
|
|
|
-@@ -1416,42 +1412,7 @@ void DownloadsAcceptDangerFunction::Prom
|
|
|
+@@ -1417,42 +1413,7 @@ void DownloadsAcceptDangerFunction::Prom
|
|
|
return;
|
|
|
}
|
|
|
RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
|
|
@@ -567,7 +519,7 @@
|
|
|
}
|
|
|
|
|
|
void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
|
|
|
-@@ -1219,56 +1207,9 @@ WebstorePrivateGetReferrerChainFunction:
|
|
|
+@@ -1219,54 +1207,9 @@ WebstorePrivateGetReferrerChainFunction:
|
|
|
|
|
|
ExtensionFunction::ResponseAction
|
|
|
WebstorePrivateGetReferrerChainFunction::Run() {
|
|
@@ -614,13 +566,11 @@
|
|
|
- request.mutable_referrer_chain_options()->set_recent_navigations_to_collect(
|
|
|
- recent_navigations_to_collect);
|
|
|
-
|
|
|
-- std::string serialized_referrer_proto = request.SerializeAsString();
|
|
|
-- // Base64 encode the proto to avoid issues with base::Value rejecting strings
|
|
|
-- // which are not valid UTF8.
|
|
|
-- base::Base64Encode(serialized_referrer_proto, &serialized_referrer_proto);
|
|
|
+- // Base64 encode the request to avoid issues with base::Value rejecting
|
|
|
+- // strings which are not valid UTF8.
|
|
|
return RespondNow(
|
|
|
ArgumentList(api::webstore_private::GetReferrerChain::Results::Create(
|
|
|
-- serialized_referrer_proto)));
|
|
|
+- base::Base64Encode(request.SerializeAsString()))));
|
|
|
+ "")));
|
|
|
}
|
|
|
|
|
@@ -663,7 +613,7 @@
|
|
|
net::NetworkTrafficAnnotationTag traffic_annotation =
|
|
|
net::DefineNetworkTrafficAnnotation("extension_blacklist", R"(
|
|
|
semantics {
|
|
|
-@@ -126,12 +110,6 @@ void BlocklistStateFetcher::SendRequest(
|
|
|
+@@ -121,12 +105,6 @@ void BlocklistStateFetcher::SendRequest(
|
|
|
base::Unretained(this), fetcher));
|
|
|
}
|
|
|
|
|
@@ -705,7 +655,7 @@
|
|
|
#include "chrome/browser/sessions/exit_type_service.h"
|
|
|
#include "chrome/browser/sharing/sharing_service_factory.h"
|
|
|
#include "chrome/browser/signin/identity_manager_factory.h"
|
|
|
-@@ -646,17 +645,6 @@ void ProfileImpl::LoadPrefsForNormalStar
|
|
|
+@@ -633,17 +632,6 @@ void ProfileImpl::LoadPrefsForNormalStar
|
|
|
|
|
|
mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
|
|
|
pref_validation_delegate;
|
|
@@ -725,7 +675,7 @@
|
|
|
CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false),
|
|
|
--- a/chrome/browser/profiles/profiles_state.cc
|
|
|
+++ b/chrome/browser/profiles/profiles_state.cc
|
|
|
-@@ -261,9 +261,6 @@ void RemoveBrowsingDataForProfile(const
|
|
|
+@@ -274,9 +274,6 @@ void RemoveBrowsingDataForProfile(const
|
|
|
// The BrowsingDataRemover relies on many objects that aren't created in unit
|
|
|
// tests. Previously this code would depend on content::ResourceDispatcherHost
|
|
|
// but that's gone, so do a similar hack for now.
|
|
@@ -745,15 +695,15 @@
|
|
|
sources = [
|
|
|
"chrome_controller_client.cc",
|
|
|
"chrome_controller_client.h",
|
|
|
-@@ -70,6 +71,7 @@ static_library("safe_browsing") {
|
|
|
+@@ -69,6 +70,7 @@ static_library("safe_browsing") {
|
|
|
"//mojo/public/cpp/system",
|
|
|
"//services/preferences/public/cpp",
|
|
|
]
|
|
|
+ }
|
|
|
|
|
|
- if (safe_browsing_mode != 0) {
|
|
|
- # "Safe Browsing Basic" files used for safe browsing in full mode
|
|
|
-@@ -501,6 +503,7 @@ static_library("advanced_protection") {
|
|
|
+ if (is_android) {
|
|
|
+ deps += [ "//chrome/browser/password_manager/android:utils" ]
|
|
|
+@@ -499,6 +501,7 @@ static_library("advanced_protection") {
|
|
|
}
|
|
|
|
|
|
source_set("metrics_collector") {
|
|
@@ -761,7 +711,7 @@
|
|
|
sources = [
|
|
|
"safe_browsing_metrics_collector_factory.cc",
|
|
|
"safe_browsing_metrics_collector_factory.h",
|
|
|
-@@ -520,6 +523,7 @@ source_set("metrics_collector") {
|
|
|
+@@ -518,6 +521,7 @@ source_set("metrics_collector") {
|
|
|
"//components/safe_browsing/core/common:safe_browsing_prefs",
|
|
|
"//content/public/browser",
|
|
|
]
|
|
@@ -794,7 +744,6 @@
|
|
|
- case safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING:
|
|
|
- return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING;
|
|
|
- case safe_browsing::SB_THREAT_TYPE_URL_MALWARE:
|
|
|
-- case safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE:
|
|
|
- return security_state::MALICIOUS_CONTENT_STATUS_MALWARE;
|
|
|
- case safe_browsing::SB_THREAT_TYPE_URL_UNWANTED:
|
|
|
- return security_state::MALICIOUS_CONTENT_STATUS_UNWANTED_SOFTWARE;
|
|
@@ -842,6 +791,7 @@
|
|
|
- return security_state::MALICIOUS_CONTENT_STATUS_MANAGED_POLICY_WARN;
|
|
|
- case safe_browsing::
|
|
|
- DEPRECATED_SB_THREAT_TYPE_URL_PASSWORD_PROTECTION_PHISHING:
|
|
|
+- case safe_browsing::DEPRECATED_SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE:
|
|
|
- case safe_browsing::SB_THREAT_TYPE_URL_BINARY_MALWARE:
|
|
|
- case safe_browsing::SB_THREAT_TYPE_EXTENSION:
|
|
|
- case safe_browsing::SB_THREAT_TYPE_BLOCKLISTED_RESOURCE:
|
|
@@ -866,7 +816,7 @@
|
|
|
|
|
|
--- a/chrome/browser/ui/BUILD.gn
|
|
|
+++ b/chrome/browser/ui/BUILD.gn
|
|
|
-@@ -5142,7 +5142,6 @@ static_library("ui") {
|
|
|
+@@ -5212,7 +5212,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",
|
|
@@ -876,7 +826,7 @@
|
|
|
"views/download/download_item_view.cc",
|
|
|
--- a/chrome/browser/ui/tab_helpers.cc
|
|
|
+++ b/chrome/browser/ui/tab_helpers.cc
|
|
|
-@@ -475,22 +475,6 @@ void TabHelpers::AttachTabHelpers(WebCon
|
|
|
+@@ -479,22 +479,6 @@ void TabHelpers::AttachTabHelpers(WebCon
|
|
|
// See https://crbug.com/910288.
|
|
|
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
|
|
|
web_contents);
|
|
@@ -901,7 +851,7 @@
|
|
|
SecurityStateTabHelper::CreateForWebContents(web_contents);
|
|
|
--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
|
|
|
+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
|
|
|
-@@ -24,7 +24,6 @@
|
|
|
+@@ -25,7 +25,6 @@
|
|
|
#include "base/values.h"
|
|
|
#include "chrome/browser/browser_process.h"
|
|
|
#include "chrome/browser/download/bubble/download_bubble_ui_controller.h"
|
|
@@ -909,7 +859,7 @@
|
|
|
#include "chrome/browser/download/download_history.h"
|
|
|
#include "chrome/browser/download/download_item_model.h"
|
|
|
#include "chrome/browser/download/download_item_warning_data.h"
|
|
|
-@@ -199,13 +198,6 @@ void DownloadsDOMHandler::SaveDangerousR
|
|
|
+@@ -280,13 +279,6 @@ void DownloadsDOMHandler::SaveDangerousR
|
|
|
}
|
|
|
|
|
|
CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS);
|
|
@@ -922,11 +872,11 @@
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
- void DownloadsDOMHandler::DiscardDangerous(const std::string& id) {
|
|
|
-@@ -401,12 +393,6 @@ void DownloadsDOMHandler::RemoveDownload
|
|
|
+ // "Suspicious" in this context applies to insecure as well as dangerous
|
|
|
+@@ -540,12 +532,6 @@ void DownloadsDOMHandler::RemoveDownload
|
|
|
IdSet ids;
|
|
|
|
|
|
- for (auto* download : to_remove) {
|
|
|
+ for (download::DownloadItem* download : to_remove) {
|
|
|
- if (download->IsDangerous() || download->IsInsecure()) {
|
|
|
- // Don't allow users to revive dangerous downloads; just nuke 'em.
|
|
|
- download->Remove();
|
|
@@ -936,10 +886,12 @@
|
|
|
DownloadItemModel item_model(download);
|
|
|
if (!item_model.ShouldShowInShelf() ||
|
|
|
download->GetState() == download::DownloadItem::IN_PROGRESS) {
|
|
|
-@@ -546,44 +532,6 @@ void DownloadsDOMHandler::FinalizeRemova
|
|
|
+@@ -685,50 +671,6 @@ void DownloadsDOMHandler::FinalizeRemova
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+-// TODO(chlily): This is obsoleted by ImprovedDownloadPageWarnings. Clean this
|
|
|
+-// up.
|
|
|
-void DownloadsDOMHandler::ShowDangerPrompt(
|
|
|
- download::DownloadItem* dangerous_item) {
|
|
|
- DownloadDangerPrompt* danger_prompt = DownloadDangerPrompt::Create(
|
|
@@ -950,6 +902,8 @@
|
|
|
- DCHECK(danger_prompt);
|
|
|
-}
|
|
|
-
|
|
|
+-// TODO(chlily): This is obsoleted by ImprovedDownloadPageWarnings. Clean this
|
|
|
+-// up.
|
|
|
-void DownloadsDOMHandler::DangerPromptDone(
|
|
|
- int download_id,
|
|
|
- DownloadDangerPrompt::Action action) {
|
|
@@ -975,6 +929,8 @@
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
+- RecordDownloadsPageValidatedHistogram(item);
|
|
|
+-
|
|
|
- item->ValidateDangerousDownload();
|
|
|
-}
|
|
|
-
|
|
@@ -991,7 +947,7 @@
|
|
|
#include "chrome/browser/ui/webui/downloads/downloads.mojom-forward.h"
|
|
|
#include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h"
|
|
|
#include "content/public/browser/web_contents_observer.h"
|
|
|
-@@ -97,18 +96,6 @@ class DownloadsDOMHandler : public conte
|
|
|
+@@ -102,18 +101,6 @@ class DownloadsDOMHandler : public conte
|
|
|
// null-checking |original_notifier_|.
|
|
|
content::DownloadManager* GetOriginalNotifierManager() const;
|
|
|
|
|
@@ -1012,11 +968,11 @@
|
|
|
bool IsDeletingHistoryAllowed();
|
|
|
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
|
|
|
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
|
|
|
-@@ -281,68 +281,6 @@ CreateHttpsOnlyModePage(content::WebCont
|
|
|
+@@ -280,66 +280,6 @@ CreateHttpsOnlyModePage(content::WebCont
|
|
|
security_interstitials::https_only_mode::HttpInterstitialState{});
|
|
|
}
|
|
|
|
|
|
--std::unique_ptr<safe_browsing::SafeBrowsingBlockingPage>
|
|
|
+-std::unique_ptr<security_interstitials::SecurityInterstitialPage>
|
|
|
-CreateSafeBrowsingBlockingPage(content::WebContents* web_contents) {
|
|
|
- safe_browsing::SBThreatType threat_type =
|
|
|
- safe_browsing::SB_THREAT_TYPE_URL_MALWARE;
|
|
@@ -1040,8 +996,6 @@
|
|
|
- threat_type = safe_browsing::SB_THREAT_TYPE_URL_PHISHING;
|
|
|
- } else if (type_param == "unwanted") {
|
|
|
- threat_type = safe_browsing::SB_THREAT_TYPE_URL_UNWANTED;
|
|
|
-- } else if (type_param == "clientside_malware") {
|
|
|
-- threat_type = safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE;
|
|
|
- } else if (type_param == "clientside_phishing") {
|
|
|
- threat_type = safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING;
|
|
|
- } else if (type_param == "billing") {
|
|
@@ -1073,15 +1027,15 @@
|
|
|
- // parts which depend on the NavigationEntry are not hit.
|
|
|
- auto* ui_manager =
|
|
|
- g_browser_process->safe_browsing_service()->ui_manager().get();
|
|
|
-- return base::WrapUnique<safe_browsing::SafeBrowsingBlockingPage>(
|
|
|
-- ui_manager->blocking_page_factory()->CreateSafeBrowsingPage(
|
|
|
-- ui_manager, web_contents, main_frame_url, {resource}, true));
|
|
|
+- return base::WrapUnique<security_interstitials::SecurityInterstitialPage>(
|
|
|
+- ui_manager->CreateBlockingPage(web_contents, main_frame_url, {resource},
|
|
|
+- /*forward_extension_event=*/false));
|
|
|
-}
|
|
|
-
|
|
|
std::unique_ptr<EnterpriseBlockPage> CreateEnterpriseBlockPage(
|
|
|
content::WebContents* web_contents) {
|
|
|
const GURL kRequestUrl("https://enterprise-block.example.net");
|
|
|
-@@ -352,94 +290,6 @@ std::unique_ptr<EnterpriseBlockPage> Cre
|
|
|
+@@ -349,94 +289,6 @@ std::unique_ptr<EnterpriseBlockPage> Cre
|
|
|
kRequestUrl));
|
|
|
}
|
|
|
|
|
@@ -1176,7 +1130,7 @@
|
|
|
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
|
|
|
std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
|
|
|
content::WebContents* web_contents) {
|
|
|
-@@ -546,12 +396,8 @@ void InterstitialHTMLSource::StartDataRe
|
|
|
+@@ -543,12 +395,8 @@ void InterstitialHTMLSource::StartDataRe
|
|
|
interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents);
|
|
|
} else if (path_without_query == "/blocked-interception") {
|
|
|
interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
|
|
@@ -1189,7 +1143,7 @@
|
|
|
} else if (path_without_query == "/clock") {
|
|
|
interstitial_delegate = CreateBadClockBlockingPage(web_contents);
|
|
|
} else if (path_without_query == "/lookalike") {
|
|
|
-@@ -566,16 +412,12 @@ void InterstitialHTMLSource::StartDataRe
|
|
|
+@@ -563,16 +411,12 @@ void InterstitialHTMLSource::StartDataRe
|
|
|
interstitial_delegate = CreateHttpsOnlyModePage(web_contents);
|
|
|
}
|
|
|
|
|
@@ -1211,7 +1165,7 @@
|
|
|
html = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
|
|
|
--- a/chrome/renderer/chrome_content_renderer_client.cc
|
|
|
+++ b/chrome/renderer/chrome_content_renderer_client.cc
|
|
|
-@@ -100,7 +100,6 @@
|
|
|
+@@ -102,7 +102,6 @@
|
|
|
#include "components/password_manager/core/common/password_manager_features.h"
|
|
|
#include "components/permissions/features.h"
|
|
|
#include "components/safe_browsing/buildflags.h"
|
|
@@ -1219,7 +1173,7 @@
|
|
|
#include "components/spellcheck/spellcheck_buildflags.h"
|
|
|
#include "components/subresource_filter/content/renderer/subresource_filter_agent.h"
|
|
|
#include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h"
|
|
|
-@@ -440,12 +439,8 @@ void ChromeContentRendererClient::Render
|
|
|
+@@ -453,12 +452,8 @@ void ChromeContentRendererClient::Render
|
|
|
subresource_filter_ruleset_dealer_ =
|
|
|
std::make_unique<subresource_filter::UnverifiedRulesetDealer>();
|
|
|
|
|
@@ -1232,13 +1186,3 @@
|
|
|
|
|
|
blink::WebScriptController::RegisterExtension(
|
|
|
extensions_v8::LoadTimesExtension::Get());
|
|
|
---- a/components/security_interstitials/content/cert_report_helper.cc
|
|
|
-+++ b/components/security_interstitials/content/cert_report_helper.cc
|
|
|
-@@ -177,7 +177,6 @@ void CertReportHelper::FinishCertCollect
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
-- ssl_cert_reporter_->ReportInvalidCertificateChain(serialized_report);
|
|
|
- }
|
|
|
-
|
|
|
- bool CertReportHelper::ShouldShowCertificateReporterCheckbox() {
|