|
@@ -2,7 +2,7 @@
|
|
|
|
|
|
--- a/chrome/browser/BUILD.gn
|
|
|
+++ b/chrome/browser/BUILD.gn
|
|
|
-@@ -629,8 +629,6 @@ static_library("browser") {
|
|
|
+@@ -640,8 +640,6 @@ static_library("browser") {
|
|
|
"internal_auth.h",
|
|
|
"interstitials/chrome_settings_page_helper.cc",
|
|
|
"interstitials/chrome_settings_page_helper.h",
|
|
@@ -11,7 +11,7 @@
|
|
|
"invalidation/profile_invalidation_provider_factory.cc",
|
|
|
"invalidation/profile_invalidation_provider_factory.h",
|
|
|
"ip_protection/ip_protection_config_http.cc",
|
|
|
-@@ -3792,9 +3790,6 @@ static_library("browser") {
|
|
|
+@@ -3829,9 +3827,6 @@ static_library("browser") {
|
|
|
"enterprise/connectors/analysis/analysis_service_settings.h",
|
|
|
"enterprise/connectors/analysis/analysis_settings.cc",
|
|
|
"enterprise/connectors/analysis/analysis_settings.h",
|
|
@@ -21,7 +21,7 @@
|
|
|
"enterprise/connectors/analysis/content_analysis_dialog.cc",
|
|
|
"enterprise/connectors/analysis/content_analysis_dialog.h",
|
|
|
"enterprise/connectors/analysis/content_analysis_downloads_delegate.cc",
|
|
|
-@@ -4108,10 +4103,6 @@ static_library("browser") {
|
|
|
+@@ -4138,10 +4133,6 @@ static_library("browser") {
|
|
|
"new_tab_page/modules/recipes/recipes_service_factory.h",
|
|
|
"new_tab_page/modules/recipes/time_format_util.cc",
|
|
|
"new_tab_page/modules/recipes/time_format_util.h",
|
|
@@ -32,7 +32,7 @@
|
|
|
"new_tab_page/modules/v2/history_clusters/history_clusters_page_handler_v2.cc",
|
|
|
"new_tab_page/modules/v2/history_clusters/history_clusters_page_handler_v2.h",
|
|
|
"new_tab_page/new_tab_page_util.cc",
|
|
|
-@@ -4591,7 +4582,6 @@ static_library("browser") {
|
|
|
+@@ -4615,7 +4606,6 @@ static_library("browser") {
|
|
|
"//chrome/browser/new_tab_page/modules/history_clusters/discount:mojo_bindings",
|
|
|
"//chrome/browser/new_tab_page/modules/photos:mojo_bindings",
|
|
|
"//chrome/browser/new_tab_page/modules/recipes:mojo_bindings",
|
|
@@ -40,7 +40,7 @@
|
|
|
"//chrome/browser/new_tab_page/modules/v2/history_clusters:mojo_bindings",
|
|
|
"//chrome/browser/policy:path_parser",
|
|
|
"//chrome/browser/profile_resetter:profile_reset_report_proto",
|
|
|
-@@ -6367,10 +6357,6 @@ static_library("browser") {
|
|
|
+@@ -6409,10 +6399,6 @@ static_library("browser") {
|
|
|
sources += [
|
|
|
"enterprise/chrome_browser_main_extra_parts_enterprise.cc",
|
|
|
"enterprise/chrome_browser_main_extra_parts_enterprise.h",
|
|
@@ -51,7 +51,7 @@
|
|
|
"enterprise/connectors/device_trust/attestation/browser/attestation_switches.cc",
|
|
|
"enterprise/connectors/device_trust/attestation/browser/attestation_switches.h",
|
|
|
"enterprise/connectors/device_trust/attestation/browser/attester.h",
|
|
|
-@@ -7901,9 +7887,14 @@ static_library("browser") {
|
|
|
+@@ -7949,9 +7935,14 @@ static_library("browser") {
|
|
|
"//components/safe_browsing/content/browser:safe_browsing_blocking_page",
|
|
|
"//components/safe_browsing/content/browser/download:download_stats",
|
|
|
"//components/safe_browsing/content/common:file_type_policies",
|
|
@@ -69,7 +69,7 @@
|
|
|
sources += [
|
|
|
--- a/chrome/browser/chrome_content_browser_client.cc
|
|
|
+++ b/chrome/browser/chrome_content_browser_client.cc
|
|
|
-@@ -5189,11 +5189,13 @@ ChromeContentBrowserClient::CreateThrott
|
|
|
+@@ -5222,11 +5222,13 @@ ChromeContentBrowserClient::CreateThrott
|
|
|
&throttles);
|
|
|
#endif
|
|
|
|
|
@@ -83,7 +83,7 @@
|
|
|
|
|
|
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
|
|
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
|
|
|
-@@ -6979,26 +6981,7 @@ ChromeContentBrowserClient::GetSafeBrows
|
|
|
+@@ -7017,26 +7019,7 @@ ChromeContentBrowserClient::GetSafeBrows
|
|
|
? content::BrowserThread::UI
|
|
|
: content::BrowserThread::IO);
|
|
|
|
|
@@ -111,7 +111,7 @@
|
|
|
}
|
|
|
|
|
|
safe_browsing::RealTimeUrlLookupServiceBase*
|
|
|
-@@ -7019,11 +7002,6 @@ ChromeContentBrowserClient::GetUrlLookup
|
|
|
+@@ -7057,11 +7040,6 @@ ChromeContentBrowserClient::GetUrlLookup
|
|
|
GetForProfile(profile);
|
|
|
}
|
|
|
#endif
|
|
@@ -141,7 +141,7 @@
|
|
|
#include "content/public/browser/download_item_utils.h"
|
|
|
#include "content/public/browser/download_manager.h"
|
|
|
|
|
|
-@@ -268,21 +266,11 @@ void DownloadBubbleUIController::Process
|
|
|
+@@ -267,21 +265,11 @@ void DownloadBubbleUIController::Process
|
|
|
switch (command) {
|
|
|
case DownloadCommands::KEEP:
|
|
|
case DownloadCommands::DISCARD:
|
|
@@ -189,7 +189,7 @@
|
|
|
|
|
|
return should_open;
|
|
|
}
|
|
|
-@@ -1546,7 +1536,6 @@ void ChromeDownloadManagerDelegate::OnDo
|
|
|
+@@ -1558,7 +1548,6 @@ void ChromeDownloadManagerDelegate::OnDo
|
|
|
DownloadItemModel model(item);
|
|
|
model.DetermineAndSetShouldPreferOpeningInBrowser(
|
|
|
target_info->target_path, target_info->is_filetype_handled_safely);
|
|
@@ -197,7 +197,7 @@
|
|
|
}
|
|
|
if (ShouldBlockFile(item, target_info->danger_type)) {
|
|
|
MaybeReportDangerousDownloadBlocked(
|
|
|
-@@ -1625,59 +1614,6 @@ bool ChromeDownloadManagerDelegate::IsOp
|
|
|
+@@ -1637,59 +1626,6 @@ bool ChromeDownloadManagerDelegate::IsOp
|
|
|
bool ChromeDownloadManagerDelegate::ShouldBlockFile(
|
|
|
download::DownloadItem* item,
|
|
|
download::DownloadDangerType danger_type) const {
|
|
@@ -257,7 +257,7 @@
|
|
|
|
|
|
return false;
|
|
|
}
|
|
|
-@@ -1692,7 +1628,6 @@ void ChromeDownloadManagerDelegate::Mayb
|
|
|
+@@ -1704,7 +1640,6 @@ void ChromeDownloadManagerDelegate::Mayb
|
|
|
service->MaybeSendDangerousDownloadOpenedReport(download,
|
|
|
show_download_in_folder);
|
|
|
}
|
|
@@ -265,7 +265,7 @@
|
|
|
if (!download->GetAutoOpened()) {
|
|
|
download::DownloadContent download_content =
|
|
|
download::DownloadContentFromMimeType(download->GetMimeType(), false);
|
|
|
-@@ -1700,6 +1635,7 @@ void ChromeDownloadManagerDelegate::Mayb
|
|
|
+@@ -1712,6 +1647,7 @@ void ChromeDownloadManagerDelegate::Mayb
|
|
|
download->GetDangerType(), download_content, base::Time::Now(),
|
|
|
download->GetEndTime(), show_download_in_folder);
|
|
|
}
|
|
@@ -273,7 +273,7 @@
|
|
|
}
|
|
|
|
|
|
void ChromeDownloadManagerDelegate::CheckDownloadAllowed(
|
|
|
-@@ -1757,8 +1693,7 @@ void ChromeDownloadManagerDelegate::Chec
|
|
|
+@@ -1769,8 +1705,7 @@ void ChromeDownloadManagerDelegate::Chec
|
|
|
DCHECK(download_item);
|
|
|
DCHECK(download_item->IsSavePackageDownload());
|
|
|
|
|
@@ -285,7 +285,7 @@
|
|
|
|
|
|
--- a/chrome/browser/download/download_item_model.cc
|
|
|
+++ b/chrome/browser/download/download_item_model.cc
|
|
|
-@@ -918,80 +918,10 @@ void DownloadItemModel::ExecuteCommand(D
|
|
|
+@@ -913,80 +913,10 @@ void DownloadItemModel::ExecuteCommand(D
|
|
|
|
|
|
DownloadItemModel::BubbleUIInfo
|
|
|
DownloadItemModel::GetBubbleUIInfoForTailoredWarning() const {
|
|
@@ -299,7 +299,7 @@
|
|
|
- TailoredVerdict::SUSPICIOUS_ARCHIVE) {
|
|
|
- return DownloadUIModel::BubbleUIInfo::SuspiciousUiPattern(
|
|
|
- l10n_util::GetStringUTF16(
|
|
|
-- IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_WARNING_MALWARE),
|
|
|
+- IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_WARNING_ARCHIVE_MALWARE),
|
|
|
- l10n_util::GetStringUTF16(
|
|
|
- IDS_DOWNLOAD_BUBBLE_CONTINUE_SUSPICIOUS_FILE));
|
|
|
- }
|
|
@@ -404,7 +404,7 @@
|
|
|
danger_level_ = GetDangerLevel(
|
|
|
visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER);
|
|
|
if (danger_level_ != DownloadFileType::NOT_DANGEROUS &&
|
|
|
-@@ -1272,6 +1274,7 @@ DownloadFileType::DangerLevel DownloadTa
|
|
|
+@@ -1270,6 +1272,7 @@ DownloadFileType::DangerLevel DownloadTa
|
|
|
|
|
|
absl::optional<base::Time>
|
|
|
DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const {
|
|
@@ -412,7 +412,7 @@
|
|
|
safe_browsing::SafeBrowsingMetricsCollector* metrics_collector =
|
|
|
safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
|
|
|
GetProfile());
|
|
|
-@@ -1280,6 +1283,9 @@ DownloadTargetDeterminer::GetLastDownloa
|
|
|
+@@ -1278,6 +1281,9 @@ DownloadTargetDeterminer::GetLastDownloa
|
|
|
safe_browsing::SafeBrowsingMetricsCollector::
|
|
|
EventType::DANGEROUS_DOWNLOAD_BYPASS)
|
|
|
: absl::nullopt;
|
|
@@ -434,7 +434,7 @@
|
|
|
#include "components/enterprise/common/proto/connectors.pb.h"
|
|
|
--- a/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.cc
|
|
|
+++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.cc
|
|
|
-@@ -82,7 +82,7 @@ absl::optional<GURL> ContentAnalysisDown
|
|
|
+@@ -90,7 +90,7 @@ absl::optional<GURL> ContentAnalysisDown
|
|
|
}
|
|
|
|
|
|
bool ContentAnalysisDownloadsDelegate::BypassRequiresJustification() const {
|
|
@@ -498,14 +498,15 @@
|
|
|
void FilesRequestHandler::OnGotFileInfo(
|
|
|
std::unique_ptr<safe_browsing::BinaryUploadService::Request> request,
|
|
|
size_t index,
|
|
|
-@@ -259,14 +219,6 @@ void FilesRequestHandler::OnGotFileInfo(
|
|
|
+@@ -259,15 +219,6 @@ void FilesRequestHandler::OnGotFileInfo(
|
|
|
void FilesRequestHandler::FinishRequestEarly(
|
|
|
std::unique_ptr<safe_browsing::BinaryUploadService::Request> request,
|
|
|
safe_browsing::BinaryUploadService::Result result) {
|
|
|
- // We add the request here in case we never actually uploaded anything, so it
|
|
|
- // wasn't added in OnGetRequestData
|
|
|
- safe_browsing::WebUIInfoSingleton::GetInstance()->AddToDeepScanRequests(
|
|
|
-- request->per_profile_request(), request->content_analysis_request());
|
|
|
+- request->per_profile_request(), /*access_token*/ "",
|
|
|
+- request->content_analysis_request());
|
|
|
- safe_browsing::WebUIInfoSingleton::GetInstance()->AddToDeepScanResponses(
|
|
|
- /*token=*/"", safe_browsing::BinaryUploadService::ResultToString(result),
|
|
|
- enterprise_connectors::ContentAnalysisResponse());
|
|
@@ -528,7 +529,7 @@
|
|
|
void OnGotFileInfo(
|
|
|
--- a/chrome/browser/enterprise/connectors/connectors_service.cc
|
|
|
+++ b/chrome/browser/enterprise/connectors/connectors_service.cc
|
|
|
-@@ -443,19 +443,6 @@ absl::optional<std::string> ConnectorsSe
|
|
|
+@@ -454,19 +454,6 @@ absl::optional<std::string> ConnectorsSe
|
|
|
return absl::nullopt;
|
|
|
}
|
|
|
|
|
@@ -610,7 +611,7 @@
|
|
|
signals.Set(device_signals::names::kBuiltInDnsClientEnabled,
|
|
|
--- a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
|
|
|
+++ b/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
|
|
|
-@@ -496,8 +496,7 @@ void RealtimeReportingClient::ReportEven
|
|
|
+@@ -507,8 +507,7 @@ void RealtimeReportingClient::ReportEven
|
|
|
}
|
|
|
|
|
|
std::string RealtimeReportingClient::GetProfileUserName() const {
|
|
@@ -747,7 +748,7 @@
|
|
|
} // namespace utils
|
|
|
--- a/chrome/browser/extensions/BUILD.gn
|
|
|
+++ b/chrome/browser/extensions/BUILD.gn
|
|
|
-@@ -302,10 +302,6 @@ static_library("extensions") {
|
|
|
+@@ -304,10 +304,6 @@ static_library("extensions") {
|
|
|
"api/runtime/chrome_runtime_api_delegate.h",
|
|
|
"api/safe_browsing_private/safe_browsing_private_api.cc",
|
|
|
"api/safe_browsing_private/safe_browsing_private_api.h",
|
|
@@ -769,7 +770,7 @@
|
|
|
"pending_extension_info.cc",
|
|
|
--- a/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
|
|
|
+++ b/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
|
|
|
-@@ -110,7 +110,6 @@ void EnsureApiBrowserContextKeyedService
|
|
|
+@@ -114,7 +114,6 @@ void EnsureApiBrowserContextKeyedService
|
|
|
extensions::PreferenceAPI::GetFactoryInstance();
|
|
|
extensions::ProcessesAPI::GetFactoryInstance();
|
|
|
extensions::ReadingListEventRouter::GetFactoryInstance();
|
|
@@ -779,7 +780,7 @@
|
|
|
extensions::SettingsOverridesAPI::GetFactoryInstance();
|
|
|
--- a/chrome/browser/extensions/api/cookies/cookies_api.cc
|
|
|
+++ b/chrome/browser/extensions/api/cookies/cookies_api.cc
|
|
|
-@@ -303,19 +303,6 @@ void CookiesGetFunction::GetCookieListCa
|
|
|
+@@ -301,19 +301,6 @@ void CookiesGetFunction::GetCookieListCa
|
|
|
}
|
|
|
|
|
|
void CookiesGetFunction::NotifyExtensionTelemetry() {
|
|
@@ -799,7 +800,7 @@
|
|
|
}
|
|
|
|
|
|
CookiesGetAllFunction::CookiesGetAllFunction() {
|
|
|
-@@ -408,24 +395,6 @@ void CookiesGetAllFunction::GetCookieLis
|
|
|
+@@ -406,24 +393,6 @@ void CookiesGetAllFunction::GetCookieLis
|
|
|
}
|
|
|
|
|
|
void CookiesGetAllFunction::NotifyExtensionTelemetry() {
|
|
@@ -896,7 +897,7 @@
|
|
|
void Blocklist::GetMalwareIDs(const std::set<std::string>& ids,
|
|
|
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
|
|
|
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
|
|
|
-@@ -731,81 +731,23 @@ void ChromeExtensionsBrowserClient::Noti
|
|
|
+@@ -734,81 +734,23 @@ void ChromeExtensionsBrowserClient::Noti
|
|
|
content::BrowserContext* context,
|
|
|
const ExtensionId& extension_id,
|
|
|
const std::string& code) const {
|
|
@@ -979,7 +980,7 @@
|
|
|
}
|
|
|
|
|
|
// static
|
|
|
-@@ -975,7 +917,6 @@ void ChromeExtensionsBrowserClient::GetW
|
|
|
+@@ -978,7 +920,6 @@ void ChromeExtensionsBrowserClient::GetW
|
|
|
|
|
|
void ChromeExtensionsBrowserClient::CreatePasswordReuseDetectionManager(
|
|
|
content::WebContents* web_contents) const {
|
|
@@ -989,7 +990,7 @@
|
|
|
media_device_salt::MediaDeviceSaltService*
|
|
|
--- a/chrome/browser/extensions/extension_service.cc
|
|
|
+++ b/chrome/browser/extensions/extension_service.cc
|
|
|
-@@ -52,7 +52,6 @@
|
|
|
+@@ -51,7 +51,6 @@
|
|
|
#include "chrome/browser/extensions/forced_extensions/install_stage_tracker.h"
|
|
|
#include "chrome/browser/extensions/install_verifier.h"
|
|
|
#include "chrome/browser/extensions/installed_loader.h"
|
|
@@ -997,7 +998,7 @@
|
|
|
#include "chrome/browser/extensions/pending_extension_manager.h"
|
|
|
#include "chrome/browser/extensions/permissions_updater.h"
|
|
|
#include "chrome/browser/extensions/profile_util.h"
|
|
|
-@@ -221,7 +220,6 @@ void ExtensionService::BlocklistExtensio
|
|
|
+@@ -235,7 +234,6 @@ void ExtensionService::BlocklistExtensio
|
|
|
blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
|
|
|
extension_id, BitMapBlocklistState::BLOCKLISTED_MALWARE,
|
|
|
extension_prefs_);
|
|
@@ -1005,7 +1006,7 @@
|
|
|
}
|
|
|
|
|
|
bool ExtensionService::OnExternalExtensionUpdateUrlFound(
|
|
|
-@@ -389,9 +387,6 @@ ExtensionService::ExtensionService(
|
|
|
+@@ -403,9 +401,6 @@ ExtensionService::ExtensionService(
|
|
|
safe_browsing_verdict_handler_(extension_prefs,
|
|
|
ExtensionRegistry::Get(profile),
|
|
|
this),
|
|
@@ -1015,7 +1016,7 @@
|
|
|
extension_telemetry_service_verdict_handler_(
|
|
|
extension_prefs,
|
|
|
ExtensionRegistry::Get(profile),
|
|
|
-@@ -919,17 +914,6 @@ bool ExtensionService::IsExtensionEnable
|
|
|
+@@ -938,17 +933,6 @@ bool ExtensionService::IsExtensionEnable
|
|
|
return extension_registrar_.IsExtensionEnabled(extension_id);
|
|
|
}
|
|
|
|
|
@@ -1033,7 +1034,7 @@
|
|
|
void ExtensionService::PerformActionBasedOnExtensionTelemetryServiceVerdicts(
|
|
|
const Blocklist::BlocklistStateMap& blocklist_state_map) {
|
|
|
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
|
-@@ -939,89 +923,6 @@ void ExtensionService::PerformActionBase
|
|
|
+@@ -958,89 +942,6 @@ void ExtensionService::PerformActionBase
|
|
|
error_controller_->ShowErrorIfNeeded();
|
|
|
}
|
|
|
|
|
@@ -1185,7 +1186,7 @@
|
|
|
|
|
|
--- a/chrome/browser/extensions/extension_system_impl.cc
|
|
|
+++ b/chrome/browser/extensions/extension_system_impl.cc
|
|
|
-@@ -448,8 +448,6 @@ void ExtensionSystemImpl::InstallUpdate(
|
|
|
+@@ -451,8 +451,6 @@ void ExtensionSystemImpl::InstallUpdate(
|
|
|
void ExtensionSystemImpl::PerformActionBasedOnOmahaAttributes(
|
|
|
const std::string& extension_id,
|
|
|
const base::Value::Dict& attributes) {
|
|
@@ -1247,7 +1248,7 @@
|
|
|
}
|
|
|
--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
|
|
|
+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
|
|
|
-@@ -34,7 +34,6 @@
|
|
|
+@@ -33,7 +33,6 @@
|
|
|
#include "chrome/browser/file_system_access/file_system_access_permission_request_manager.h"
|
|
|
#include "chrome/browser/permissions/permission_decision_auto_blocker_factory.h"
|
|
|
#include "chrome/browser/profiles/profile.h"
|
|
@@ -1255,7 +1256,7 @@
|
|
|
#include "chrome/browser/ui/file_system_access_dialogs.h"
|
|
|
#include "chrome/common/chrome_paths.h"
|
|
|
#include "chrome/common/pdf_util.h"
|
|
|
-@@ -411,86 +410,6 @@ bool ShouldBlockAccessToPath(const base:
|
|
|
+@@ -409,87 +408,6 @@ bool ShouldBlockAccessToPath(const base:
|
|
|
return true;
|
|
|
}
|
|
|
|
|
@@ -1330,6 +1331,7 @@
|
|
|
- case Result::SENSITIVE_CONTENT_BLOCK:
|
|
|
- case Result::DEEP_SCANNED_SAFE:
|
|
|
- case Result::PROMPT_FOR_SCANNING:
|
|
|
+- case Result::PROMPT_FOR_LOCAL_PASSWORD_SCANNING:
|
|
|
- case Result::DEEP_SCANNED_FAILED:
|
|
|
- NOTREACHED();
|
|
|
- return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult::
|
|
@@ -1342,7 +1344,7 @@
|
|
|
std::string GenerateLastPickedDirectoryKey(const std::string& id) {
|
|
|
return id.empty() ? kDefaultLastPickedDirectoryKey
|
|
|
: base::StrCat({kCustomLastPickedDirectoryKey, "-", id});
|
|
|
-@@ -510,13 +429,7 @@ std::string_view GetGrantKeyFromGrantTyp
|
|
|
+@@ -509,13 +427,7 @@ std::string_view GetGrantKeyFromGrantTyp
|
|
|
bool FileHasDangerousExtension(const url::Origin& origin,
|
|
|
const base::FilePath& path,
|
|
|
Profile* profile) {
|
|
@@ -1357,7 +1359,7 @@
|
|
|
}
|
|
|
|
|
|
} // namespace
|
|
|
-@@ -1494,29 +1407,6 @@ void ChromeFileSystemAccessPermissionCon
|
|
|
+@@ -1511,29 +1423,6 @@ void ChromeFileSystemAccessPermissionCon
|
|
|
std::move(callback));
|
|
|
}
|
|
|
|
|
@@ -1389,7 +1391,7 @@
|
|
|
const base::FilePath& path,
|
|
|
--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
|
|
|
+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
|
|
|
-@@ -138,10 +138,6 @@ class ChromeFileSystemAccessPermissionCo
|
|
|
+@@ -152,10 +152,6 @@ class ChromeFileSystemAccessPermissionCo
|
|
|
UserAction user_action,
|
|
|
content::GlobalRenderFrameHostId frame_id,
|
|
|
base::OnceCallback<void(SensitiveEntryResult)> callback) override;
|
|
@@ -1410,7 +1412,7 @@
|
|
|
#include "components/url_formatter/elide_url.h"
|
|
|
#include "content/public/browser/browser_thread.h"
|
|
|
#include "content/public/browser/desktop_media_id.h"
|
|
|
-@@ -124,6 +125,7 @@ void DisplayMediaAccessHandler::HandleRe
|
|
|
+@@ -122,6 +123,7 @@ void DisplayMediaAccessHandler::HandleRe
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -1418,7 +1420,7 @@
|
|
|
// SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
|
|
|
// warnings until user interaction. If the current page has a delayed warning,
|
|
|
// it'll have a user interaction observer attached. Show the warning
|
|
|
-@@ -139,6 +141,7 @@ void DisplayMediaAccessHandler::HandleRe
|
|
|
+@@ -137,6 +139,7 @@ void DisplayMediaAccessHandler::HandleRe
|
|
|
observer->OnDesktopCaptureRequest();
|
|
|
return;
|
|
|
}
|
|
@@ -1445,14 +1447,14 @@
|
|
|
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
|
|
|
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
|
|
|
@@ -34,7 +34,6 @@
|
|
|
- #include "chrome/browser/password_manager/password_store_factory.h"
|
|
|
+ #include "chrome/browser/password_manager/profile_password_store_factory.h"
|
|
|
#include "chrome/browser/profiles/profile.h"
|
|
|
#include "chrome/browser/profiles/profile_manager.h"
|
|
|
-#include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
|
|
|
#include "chrome/browser/safe_browsing/user_interaction_observer.h"
|
|
|
#include "chrome/browser/signin/identity_manager_factory.h"
|
|
|
#include "chrome/browser/sync/sync_service_factory.h"
|
|
|
-@@ -863,6 +862,7 @@ autofill::LanguageCode ChromePasswordMan
|
|
|
+@@ -865,6 +864,7 @@ autofill::LanguageCode ChromePasswordMan
|
|
|
return autofill::LanguageCode();
|
|
|
}
|
|
|
|
|
@@ -1460,7 +1462,7 @@
|
|
|
safe_browsing::PasswordProtectionService*
|
|
|
ChromePasswordManagerClient::GetPasswordProtectionService() const {
|
|
|
return safe_browsing::ChromePasswordProtectionService::
|
|
|
-@@ -882,6 +882,7 @@ void ChromePasswordManagerClient::CheckS
|
|
|
+@@ -884,6 +884,7 @@ void ChromePasswordManagerClient::CheckS
|
|
|
}
|
|
|
}
|
|
|
#endif // defined(ON_FOCUS_PING_ENABLED)
|
|
@@ -1468,7 +1470,7 @@
|
|
|
|
|
|
#if !BUILDFLAG(IS_ANDROID)
|
|
|
void ChromePasswordManagerClient::MaybeReportEnterpriseLoginEvent(
|
|
|
-@@ -889,28 +890,10 @@ void ChromePasswordManagerClient::MaybeR
|
|
|
+@@ -891,28 +892,10 @@ void ChromePasswordManagerClient::MaybeR
|
|
|
bool is_federated,
|
|
|
const url::Origin& federated_origin,
|
|
|
const std::u16string& login_user_name) const {
|
|
@@ -1497,7 +1499,7 @@
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
-@@ -1498,6 +1481,7 @@ bool ChromePasswordManagerClient::IsPass
|
|
|
+@@ -1509,6 +1492,7 @@ bool ChromePasswordManagerClient::IsPass
|
|
|
is_enabled = false;
|
|
|
}
|
|
|
|
|
@@ -1505,7 +1507,7 @@
|
|
|
// SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
|
|
|
// warnings until user interaction. If the current page has a delayed warning,
|
|
|
// it'll have a user interaction observer attached. Disable password
|
|
|
-@@ -1508,6 +1492,7 @@ bool ChromePasswordManagerClient::IsPass
|
|
|
+@@ -1519,6 +1503,7 @@ bool ChromePasswordManagerClient::IsPass
|
|
|
observer->OnPasswordSaveOrAutofillDenied();
|
|
|
is_enabled = false;
|
|
|
}
|
|
@@ -1515,7 +1517,7 @@
|
|
|
password_manager::BrowserSavePasswordProgressLogger logger(
|
|
|
--- a/chrome/browser/password_manager/chrome_password_manager_client.h
|
|
|
+++ b/chrome/browser/password_manager/chrome_password_manager_client.h
|
|
|
-@@ -229,6 +229,7 @@ class ChromePasswordManagerClient
|
|
|
+@@ -230,6 +230,7 @@ class ChromePasswordManagerClient
|
|
|
void AnnotateNavigationEntry(bool has_password_field) override;
|
|
|
autofill::LanguageCode GetPageLanguage() const override;
|
|
|
|
|
@@ -1523,7 +1525,7 @@
|
|
|
safe_browsing::PasswordProtectionService* GetPasswordProtectionService()
|
|
|
const override;
|
|
|
|
|
|
-@@ -236,6 +237,7 @@ class ChromePasswordManagerClient
|
|
|
+@@ -237,6 +238,7 @@ class ChromePasswordManagerClient
|
|
|
void CheckSafeBrowsingReputation(const GURL& form_action,
|
|
|
const GURL& frame_url) override;
|
|
|
#endif
|
|
@@ -1647,7 +1649,7 @@
|
|
|
|
|
|
--- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
|
|
|
+++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
|
|
|
-@@ -335,50 +335,5 @@ bool PredictionBasedPermissionUiSelector
|
|
|
+@@ -335,49 +335,5 @@ bool PredictionBasedPermissionUiSelector
|
|
|
|
|
|
PredictionSource PredictionBasedPermissionUiSelector::GetPredictionTypeToUse(
|
|
|
permissions::RequestType request_type) {
|
|
@@ -1657,12 +1659,11 @@
|
|
|
- const bool is_notification_cpss_enabled =
|
|
|
- profile_->GetPrefs()->GetBoolean(prefs::kEnableNotificationCPSS) &&
|
|
|
- (base::FeatureList::IsEnabled(features::kQuietNotificationPrompts) ||
|
|
|
-- base::FeatureList::IsEnabled(
|
|
|
-- permissions::features::kPermissionQuietChip));
|
|
|
+- permissions::PermissionUtil::DoesPlatformSupportChip());
|
|
|
-
|
|
|
- const bool is_geolocation_cpss_enabled =
|
|
|
- profile_->GetPrefs()->GetBoolean(prefs::kEnableGeolocationCPSS) &&
|
|
|
-- base::FeatureList::IsEnabled(permissions::features::kPermissionQuietChip);
|
|
|
+- permissions::PermissionUtil::DoesPlatformSupportChip();
|
|
|
-
|
|
|
- if (request_type == permissions::RequestType::kNotifications &&
|
|
|
- !is_notification_cpss_enabled) {
|
|
@@ -1708,7 +1709,7 @@
|
|
|
#include "components/safe_browsing/content/common/file_type_policies_prefs.h"
|
|
|
#include "components/safe_browsing/core/common/safe_browsing_policy_handler.h"
|
|
|
#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
|
|
|
-@@ -2095,8 +2096,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
+@@ -2137,8 +2138,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
handlers->AddHandler(
|
|
|
std::make_unique<bookmarks::ManagedBookmarksPolicyHandler>(
|
|
|
chrome_schema));
|
|
@@ -1717,7 +1718,7 @@
|
|
|
handlers->AddHandler(std::make_unique<syncer::SyncPolicyHandler>());
|
|
|
handlers->AddHandler(
|
|
|
std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
|
|
|
-@@ -2179,20 +2178,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
+@@ -2215,20 +2214,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode,
|
|
|
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope, chrome_schema));
|
|
|
|
|
@@ -1748,7 +1749,7 @@
|
|
|
#include "chrome/browser/new_tab_page/promos/promo_service.h"
|
|
|
#include "chrome/browser/policy/developer_tools_policy_handler.h"
|
|
|
#include "chrome/browser/search/background/ntp_custom_background_service.h"
|
|
|
-@@ -1805,7 +1804,6 @@ void RegisterProfilePrefs(user_prefs::Pr
|
|
|
+@@ -1813,7 +1812,6 @@ void RegisterProfilePrefs(user_prefs::Pr
|
|
|
NewTabPageHandler::RegisterProfilePrefs(registry);
|
|
|
NewTabPageUI::RegisterProfilePrefs(registry);
|
|
|
NewTabUI::RegisterProfilePrefs(registry);
|
|
@@ -1758,7 +1759,7 @@
|
|
|
PinnedTabCodec::RegisterProfilePrefs(registry);
|
|
|
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
|
|
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
|
|
-@@ -710,9 +710,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
|
|
+@@ -730,9 +730,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
|
|
enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance();
|
|
|
enterprise_connectors::DeviceTrustServiceFactory::GetInstance();
|
|
|
#endif
|
|
@@ -1768,7 +1769,7 @@
|
|
|
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
|
|
BUILDFLAG(IS_ANDROID)
|
|
|
enterprise_idle::IdleServiceFactory::GetInstance();
|
|
|
-@@ -1008,23 +1005,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
|
|
+@@ -1037,23 +1034,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
|
|
#if !BUILDFLAG(IS_ANDROID)
|
|
|
ResetReportUploaderFactory::GetInstance();
|
|
|
#endif
|
|
@@ -1790,8 +1791,8 @@
|
|
|
- safe_browsing::TailoredSecurityServiceFactory::GetInstance();
|
|
|
- safe_browsing::VerdictCacheManagerFactory::GetInstance();
|
|
|
SafeSearchFactory::GetInstance();
|
|
|
- #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
|
|
|
- screen_ai::AXScreenAIAnnotatorFactory::EnsureFactoryBuilt();
|
|
|
+ #if !BUILDFLAG(IS_ANDROID)
|
|
|
+ SafetyHubMenuNotificationServiceFactory::GetInstance();
|
|
|
--- a/chrome/browser/safe_browsing/cloud_content_scanning/file_opening_job.cc
|
|
|
+++ b/chrome/browser/safe_browsing/cloud_content_scanning/file_opening_job.cc
|
|
|
@@ -71,10 +71,6 @@ void FileOpeningJob::ProcessNextTask(bas
|
|
@@ -1983,7 +1984,7 @@
|
|
|
} // namespace
|
|
|
--- a/chrome/browser/ui/BUILD.gn
|
|
|
+++ b/chrome/browser/ui/BUILD.gn
|
|
|
-@@ -568,7 +568,6 @@ static_library("ui") {
|
|
|
+@@ -575,7 +575,6 @@ static_library("ui") {
|
|
|
"//components/renderer_context_menu",
|
|
|
"//components/resources",
|
|
|
"//components/safe_browsing/content/browser",
|
|
@@ -1991,7 +1992,7 @@
|
|
|
"//components/safe_browsing/content/browser/password_protection",
|
|
|
"//components/safe_browsing/content/browser/web_ui",
|
|
|
"//components/safe_browsing/core/browser/db:database_manager",
|
|
|
-@@ -3877,8 +3876,6 @@ static_library("ui") {
|
|
|
+@@ -3956,8 +3955,6 @@ static_library("ui") {
|
|
|
"startup/web_app_startup_utils.h",
|
|
|
"tab_contents/chrome_web_contents_menu_helper.cc",
|
|
|
"tab_contents/chrome_web_contents_menu_helper.h",
|
|
@@ -2000,7 +2001,7 @@
|
|
|
"views/autofill/payments/virtual_card_selection_dialog_view.cc",
|
|
|
"views/autofill/payments/virtual_card_selection_dialog_view.h",
|
|
|
"views/autofill/payments/webauthn_dialog_view.cc",
|
|
|
-@@ -5480,8 +5477,6 @@ static_library("ui") {
|
|
|
+@@ -5566,8 +5563,6 @@ static_library("ui") {
|
|
|
"views/safe_browsing/prompt_for_scanning_modal_dialog.h",
|
|
|
"views/safe_browsing/tailored_security_desktop_dialog_manager.cc",
|
|
|
"views/safe_browsing/tailored_security_desktop_dialog_manager.h",
|
|
@@ -2009,6 +2010,46 @@
|
|
|
"views/send_tab_to_self/manage_account_devices_link_view.cc",
|
|
|
"views/send_tab_to_self/manage_account_devices_link_view.h",
|
|
|
"views/send_tab_to_self/send_tab_to_self_bubble_device_button.cc",
|
|
|
+--- a/chrome/browser/ui/download/download_bubble_row_view_info.cc
|
|
|
++++ b/chrome/browser/ui/download/download_bubble_row_view_info.cc
|
|
|
+@@ -10,7 +10,6 @@
|
|
|
+ #include "chrome/browser/enterprise/connectors/common.h"
|
|
|
+ #include "chrome/browser/safe_browsing/advanced_protection_status_manager.h"
|
|
|
+ #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h"
|
|
|
+-#include "chrome/browser/safe_browsing/download_protection/download_protection_service.h"
|
|
|
+ #include "chrome/browser/ui/color/chrome_color_id.h"
|
|
|
+ #include "chrome/browser/ui/download/download_item_mode.h"
|
|
|
+ #include "chrome/grit/generated_resources.h"
|
|
|
+@@ -517,29 +516,6 @@ void DownloadBubbleRowViewInfo::Populate
|
|
|
+ }
|
|
|
+
|
|
|
+ void DownloadBubbleRowViewInfo::PopulateForTailoredWarning() {
|
|
|
+- CHECK(model_->GetDownloadItem());
|
|
|
+- download::DownloadDangerType danger_type = model_->GetDangerType();
|
|
|
+- TailoredVerdict tailored_verdict = safe_browsing::DownloadProtectionService::
|
|
|
+- GetDownloadProtectionTailoredVerdict(model_->GetDownloadItem());
|
|
|
+-
|
|
|
+- // Suspicious archives
|
|
|
+- if (danger_type == download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT &&
|
|
|
+- tailored_verdict.tailored_verdict_type() ==
|
|
|
+- TailoredVerdict::SUSPICIOUS_ARCHIVE) {
|
|
|
+- PopulateSuspiciousUiPattern();
|
|
|
+- return;
|
|
|
+- }
|
|
|
+-
|
|
|
+- // Cookie theft
|
|
|
+- if (danger_type ==
|
|
|
+- download::DOWNLOAD_DANGER_TYPE_DANGEROUS_ACCOUNT_COMPROMISE &&
|
|
|
+- tailored_verdict.tailored_verdict_type() ==
|
|
|
+- TailoredVerdict::COOKIE_THEFT) {
|
|
|
+- PopulateDangerousUiPattern();
|
|
|
+- return;
|
|
|
+- }
|
|
|
+-
|
|
|
+- NOTREACHED();
|
|
|
+ }
|
|
|
+
|
|
|
+ void DownloadBubbleRowViewInfo::PopulateForFileTypeWarningNoSafeBrowsing() {
|
|
|
--- a/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.cc
|
|
|
+++ b/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.cc
|
|
|
@@ -16,6 +16,7 @@
|
|
@@ -2037,9 +2078,9 @@
|
|
|
void JavaScriptTabModalDialogManagerDelegateDesktop::DidCloseDialog() {
|
|
|
--- a/chrome/browser/ui/tab_helpers.cc
|
|
|
+++ b/chrome/browser/ui/tab_helpers.cc
|
|
|
-@@ -347,7 +347,6 @@ void TabHelpers::AttachTabHelpers(WebCon
|
|
|
- chrome::ChainedBackNavigationTracker::CreateForWebContents(web_contents);
|
|
|
- chrome_browser_net::NetErrorTabHelper::CreateForWebContents(web_contents);
|
|
|
+@@ -362,7 +362,6 @@ void TabHelpers::AttachTabHelpers(WebCon
|
|
|
+ ChromeComposeClient::CreateForWebContents(web_contents);
|
|
|
+ #endif
|
|
|
ChromePasswordManagerClient::CreateForWebContents(web_contents);
|
|
|
- ChromePasswordReuseDetectionManagerClient::CreateForWebContents(web_contents);
|
|
|
CreateSubresourceFilterWebContentsHelper(web_contents);
|
|
@@ -2053,9 +2094,9 @@
|
|
|
#include "chrome/browser/download/download_item_warning_data.h"
|
|
|
-#include "chrome/browser/safe_browsing/download_protection/download_protection_service.h"
|
|
|
#include "chrome/browser/ui/browser.h"
|
|
|
- #include "chrome/browser/ui/views/download/bubble/download_bubble_partial_view.h"
|
|
|
- #include "chrome/browser/ui/views/download/bubble/download_bubble_primary_view.h"
|
|
|
-@@ -140,10 +139,6 @@ void DownloadBubbleContentsView::AddSecu
|
|
|
+ #include "chrome/browser/ui/browser_element_identifiers.h"
|
|
|
+ #include "chrome/browser/ui/download/download_bubble_info.h"
|
|
|
+@@ -149,10 +148,6 @@ void DownloadBubbleContentsView::AddSecu
|
|
|
void DownloadBubbleContentsView::ProcessDeepScanPress(
|
|
|
const ContentId& id,
|
|
|
base::optional_ref<const std::string> password) {
|
|
@@ -2103,7 +2144,7 @@
|
|
|
open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) ||
|
|
|
prompt_to_scan || allow_open_during_deep_scan);
|
|
|
|
|
|
-@@ -1276,7 +1277,9 @@ void DownloadItemView::ShowContextMenuIm
|
|
|
+@@ -1277,7 +1278,9 @@ void DownloadItemView::ShowContextMenuIm
|
|
|
}
|
|
|
|
|
|
void DownloadItemView::OpenDownloadDuringAsyncScanning() {
|
|
@@ -2243,6 +2284,68 @@
|
|
|
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
|
|
|
if (capture_policy::IsGetAllScreensMediaAllowedForAnySite(profile)) {
|
|
|
AddThreatProtectionPermission(kManagementScreenCaptureEvent,
|
|
|
+--- a/chrome/browser/ui/webui/settings/hats_handler.cc
|
|
|
++++ b/chrome/browser/ui/webui/settings/hats_handler.cc
|
|
|
+@@ -85,41 +85,6 @@ void HatsHandler::RegisterMessages() {
|
|
|
+ void HatsHandler::HandleSecurityPageInteractionOccurred(
|
|
|
+ const base::Value::List& args) {
|
|
|
+ AllowJavascript();
|
|
|
+-
|
|
|
+- // There are 2 argument in the input list.
|
|
|
+- // The first one is the SecurityPageInteraction that triggered the survey.
|
|
|
+- // The second one is the safe browsing setting the user was on.
|
|
|
+- CHECK_EQ(2U, args.size());
|
|
|
+-
|
|
|
+- Profile* profile = Profile::FromWebUI(web_ui());
|
|
|
+-
|
|
|
+- // Enterprise users consideration.
|
|
|
+- // If the admin disabled the survey, the survey will not be requested.
|
|
|
+- if (!safe_browsing::IsSafeBrowsingSurveysEnabled(*profile->GetPrefs())) {
|
|
|
+- return;
|
|
|
+- }
|
|
|
+-
|
|
|
+- // Request HaTS survey.
|
|
|
+- HatsService* hats_service = HatsServiceFactory::GetForProfile(
|
|
|
+- profile, /* create_if_necessary = */ true);
|
|
|
+-
|
|
|
+- // The HaTS service may not be available for the profile, for example if it
|
|
|
+- // is a guest profile.
|
|
|
+- if (!hats_service) {
|
|
|
+- return;
|
|
|
+- }
|
|
|
+-
|
|
|
+- // Generate the Product Specific bits data from |profile| and |args|.
|
|
|
+- SurveyStringData product_specific_string_data =
|
|
|
+- GetSecurityPageProductSpecificStringData(profile, args);
|
|
|
+-
|
|
|
+- hats_service->LaunchDelayedSurveyForWebContents(
|
|
|
+- kHatsSurveyTriggerSettingsSecurity, web_ui()->GetWebContents(),
|
|
|
+- features::kHappinessTrackingSurveysForSecurityPageTime.Get()
|
|
|
+- .InMilliseconds(),
|
|
|
+- /*product_specific_bits_data=*/{},
|
|
|
+- /*product_specific_string_data=*/product_specific_string_data,
|
|
|
+- /*require_same_origin=*/true);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+@@ -180,17 +145,7 @@ SurveyStringData HatsHandler::GetSecurit
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+- bool safe_browsing_enabled =
|
|
|
+- profile->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled);
|
|
|
+- bool safe_browsing_enhanced_enabled =
|
|
|
+- profile->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnhanced);
|
|
|
+- if (safe_browsing_enhanced_enabled) {
|
|
|
+- safe_browsing_setting_current = "enhanced_protection";
|
|
|
+- } else if (safe_browsing_enabled) {
|
|
|
+- safe_browsing_setting_current = "standard_protection";
|
|
|
+- } else {
|
|
|
+ safe_browsing_setting_current = "no_protection";
|
|
|
+- }
|
|
|
+
|
|
|
+ std::string client_channel =
|
|
|
+ std::string(version_info::GetChannelString(chrome::GetChannel()));
|
|
|
--- a/chrome/browser/webshare/share_service_impl.cc
|
|
|
+++ b/chrome/browser/webshare/share_service_impl.cc
|
|
|
@@ -17,7 +17,9 @@
|
|
@@ -2287,7 +2390,7 @@
|
|
|
std::move(callback),
|
|
|
--- a/chrome/test/BUILD.gn
|
|
|
+++ b/chrome/test/BUILD.gn
|
|
|
-@@ -1721,7 +1721,6 @@ if (!is_android) {
|
|
|
+@@ -1811,7 +1811,6 @@ if (!is_android) {
|
|
|
"//components/resources",
|
|
|
"//components/safe_browsing:buildflags",
|
|
|
"//components/safe_browsing/content/browser",
|
|
@@ -2295,7 +2398,7 @@
|
|
|
"//components/safe_browsing/content/browser:safe_browsing_service",
|
|
|
"//components/safe_browsing/content/browser/password_protection",
|
|
|
"//components/safe_browsing/content/browser/password_protection:test_support",
|
|
|
-@@ -6679,7 +6678,6 @@ test("unit_tests") {
|
|
|
+@@ -6792,7 +6791,6 @@ test("unit_tests") {
|
|
|
"//components/resources",
|
|
|
"//components/safe_browsing:buildflags",
|
|
|
"//components/safe_browsing/content/browser",
|
|
@@ -2303,7 +2406,7 @@
|
|
|
"//components/safe_browsing/content/browser/password_protection",
|
|
|
"//components/safe_browsing/content/browser/password_protection:mock_password_protection",
|
|
|
"//components/safe_browsing/content/browser/web_ui",
|
|
|
-@@ -9848,9 +9846,6 @@ test("unit_tests") {
|
|
|
+@@ -10008,9 +10006,6 @@ test("unit_tests") {
|
|
|
]
|
|
|
}
|
|
|
|
|
@@ -2344,7 +2447,7 @@
|
|
|
# These two flags are equivalent, but `enable_print_content_analysis` still
|
|
|
--- a/components/password_manager/content/browser/content_password_manager_driver.cc
|
|
|
+++ b/components/password_manager/content/browser/content_password_manager_driver.cc
|
|
|
-@@ -484,7 +484,7 @@ void ContentPasswordManagerDriver::Check
|
|
|
+@@ -496,7 +496,7 @@ void ContentPasswordManagerDriver::Check
|
|
|
if (!password_manager::bad_message::CheckFrameNotPrerendering(
|
|
|
render_frame_host_))
|
|
|
return;
|
|
@@ -2355,7 +2458,7 @@
|
|
|
}
|
|
|
--- a/components/password_manager/core/browser/password_manager_client.h
|
|
|
+++ b/components/password_manager/core/browser/password_manager_client.h
|
|
|
-@@ -398,11 +398,14 @@ class PasswordManagerClient {
|
|
|
+@@ -399,11 +399,14 @@ class PasswordManagerClient {
|
|
|
// Returns the current best guess as to the page's display language.
|
|
|
virtual autofill::LanguageCode GetPageLanguage() const;
|
|
|
|
|
@@ -2516,7 +2619,7 @@
|
|
|
}
|
|
|
--- a/components/safe_browsing/core/browser/verdict_cache_manager.cc
|
|
|
+++ b/components/safe_browsing/core/browser/verdict_cache_manager.cc
|
|
|
-@@ -455,16 +455,6 @@ VerdictCacheManager::VerdictCacheManager
|
|
|
+@@ -441,16 +441,6 @@ VerdictCacheManager::VerdictCacheManager
|
|
|
// pref_service can be null in tests.
|
|
|
if (pref_service) {
|
|
|
pref_change_registrar_.Init(pref_service);
|
|
@@ -2689,7 +2792,7 @@
|
|
|
|
|
|
--- a/extensions/browser/updater/update_service.cc
|
|
|
+++ b/extensions/browser/updater/update_service.cc
|
|
|
-@@ -127,13 +127,6 @@ void UpdateService::OnCrxStateChange(Upd
|
|
|
+@@ -128,13 +128,6 @@ void UpdateService::OnCrxStateChange(Upd
|
|
|
break;
|
|
|
}
|
|
|
|