PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
Files
c1733acaa55733dbcdbc925fc4f1a045c3c778ff
cromite/build/patches/00WIN-ADDTO-Disable-safe-browsing.patch
T

1994 lines
90 KiB
Diff
Raw Blame History

From: Your Name <you@example.com>
Date: Wed, 12 Oct 2022 09:52:02 +0000
Subject: WIN ADDTO Disable safe browsing
---
chrome/browser/BUILD.gn | 16 +-
.../chrome_browsing_data_remover_delegate.cc | 2 -
chrome/browser/chrome_browser_main_win.cc | 6 -
.../bubble/download_bubble_controller.cc | 2 +
.../chrome_download_manager_delegate.cc | 16 +-
.../browser/download/download_item_model.cc | 93 +---------
.../analysis/content_analysis_delegate.cc | 164 +-----------------
.../analysis/content_analysis_delegate.h | 7 -
.../analysis/request_handler_base.cc | 20 ---
.../reporting/realtime_reporting_client.cc | 3 +-
chrome/browser/extensions/BUILD.gn | 5 -
.../extensions/api/cookies/cookies_api.cc | 35 ----
.../safe_browsing_private_api.cc | 3 +-
.../safe_browsing_private_event_router.cc | 44 ++---
.../webstore_private/webstore_private_api.cc | 15 +-
.../extensions/blocklist_state_fetcher.cc | 13 +-
.../chrome_extensions_browser_client.cc | 41 +----
.../browser/extensions/extension_allowlist.cc | 9 -
.../webrtc/display_media_access_handler.cc | 1 -
.../safe_browsing/safe_browsing_handler.cc | 5 +-
.../safe_browsing/safe_browsing_handler.h | 3 -
.../notification_display_service_impl.cc | 7 -
.../chrome_password_manager_client.cc | 19 +-
...nfiguration_policy_handler_list_factory.cc | 7 -
chrome/browser/prefs/browser_prefs.cc | 2 +
chrome/browser/printing/print_view_manager.cc | 15 --
chrome/browser/profiles/profiles_state.cc | 2 -
chrome/browser/resources/BUILD.gn | 1 -
chrome/browser/safe_browsing/BUILD.gn | 8 +-
.../safe_browsing/chrome_cleaner/BUILD.gn | 1 -
.../chrome_cleaner/settings_resetter_win.cc | 1 -
.../download_protection/file_analyzer.h | 20 ---
.../chrome_security_blocking_page_factory.cc | 21 ---
chrome/browser/ui/BUILD.gn | 6 -
...b_modal_dialog_manager_delegate_desktop.cc | 1 -
.../ui/page_info/chrome_page_info_delegate.cc | 1 -
.../chrome_web_contents_view_handle_drop.cc | 159 -----------------
.../ui/views/download/download_item_view.cc | 23 +--
.../webui/downloads/downloads_dom_handler.cc | 21 +--
.../ui/webui/downloads/downloads_ui.cc | 5 +-
chrome/browser/ui/webui/intro/intro_ui.cc | 33 +---
chrome/browser/webshare/share_service_impl.cc | 4 +
chrome/chrome_paks.gni | 2 -
.../public/cpp/sandboxed_rar_analyzer.cc | 16 +-
.../public/cpp/sandboxed_rar_analyzer.h | 2 -
.../public/cpp/sandboxed_zip_analyzer.h | 2 -
chrome/test/BUILD.gn | 4 -
.../browser/mojo_safe_browsing_impl.cc | 1 +
.../core/common/safe_browsing_prefs.cc | 2 +-
printing/buildflags/buildflags.gni | 2 +-
.../tracked_persistent_pref_store_factory.cc | 10 +-
51 files changed, 74 insertions(+), 827 deletions(-)
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1932,10 +1932,6 @@ static_library("browser") {
"//chrome/browser/ui",
"//chrome/browser/storage_access_api:permissions",
"//chrome/browser/top_level_storage_access_api:permissions",
- "//chrome/browser/safe_browsing",
- "//chrome/browser/safe_browsing:verdict_cache_manager_factory",
- "//chrome/browser/safe_browsing:advanced_protection",
- "//chrome/browser/safe_browsing:metrics_collector",
# TODO(crbug.com/1030821): Eliminate usages of browser.h from Media Router.
"//chrome/browser/media/router",
@@ -2038,10 +2034,7 @@ static_library("browser") {
"//chrome/browser/push_messaging:budget_proto",
"//chrome/browser/resource_coordinator:mojo_bindings",
"//chrome/browser/resource_coordinator:tab_manager_features",
- "//chrome/browser/safe_browsing",
- "//chrome/browser/safe_browsing:advanced_protection",
- "//chrome/browser/safe_browsing:metrics_collector",
- "//chrome/browser/safe_browsing:verdict_cache_manager_factory",
+ "//components/safe_browsing/content/common:interfaces",
"//chrome/browser/share",
"//chrome/browser/sharing:buildflags",
"//chrome/browser/sharing/proto",
@@ -3657,18 +3650,12 @@ static_library("browser") {
"enterprise/connectors/analysis/analysis_service_settings.h",
"enterprise/connectors/analysis/analysis_settings.cc",
"enterprise/connectors/analysis/analysis_settings.h",
- "enterprise/connectors/analysis/content_analysis_delegate.cc",
- "enterprise/connectors/analysis/content_analysis_delegate.h",
"enterprise/connectors/analysis/content_analysis_delegate_base.cc",
"enterprise/connectors/analysis/content_analysis_delegate_base.h",
"enterprise/connectors/analysis/content_analysis_dialog.cc",
"enterprise/connectors/analysis/content_analysis_dialog.h",
"enterprise/connectors/analysis/content_analysis_downloads_delegate.cc",
"enterprise/connectors/analysis/content_analysis_downloads_delegate.h",
- "enterprise/connectors/analysis/files_request_handler.cc",
- "enterprise/connectors/analysis/files_request_handler.h",
- "enterprise/connectors/analysis/page_print_analysis_request.cc",
- "enterprise/connectors/analysis/page_print_analysis_request.h",
"enterprise/connectors/analysis/request_handler_base.cc",
"enterprise/connectors/analysis/request_handler_base.h",
"enterprise/connectors/common.cc",
@@ -7920,7 +7907,6 @@ static_library("test_support") {
":browser",
"//chrome/browser/autofill:test_support",
"//chrome/browser/profiles:profile",
- "//chrome/browser/safe_browsing:test_support",
"//chrome/browser/ui:test_support",
]
deps = [
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -653,8 +653,6 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
base::BindOnce(
&ChromeBrowsingDataRemoverDelegate::CreateTaskCompletionClosure,
base::Unretained(this), TracingDataType::kCookies));
- safe_browsing::VerdictCacheManagerFactory::GetForProfile(profile_)
- ->OnCookiesDeleted();
}
if (filter_builder->GetMode() ==
diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc
--- a/chrome/browser/chrome_browser_main_win.cc
+++ b/chrome/browser/chrome_browser_main_win.cc
@@ -395,12 +395,6 @@ void ShowCloseBrowserFirstMessageBox() {
}
void MaybePostSettingsResetPrompt() {
- if (base::FeatureList::IsEnabled(safe_browsing::kSettingsResetPrompt)) {
- content::GetUIThreadTaskRunner({base::TaskPriority::BEST_EFFORT})
- ->PostTask(FROM_HERE,
- base::BindOnce(
- safe_browsing::MaybeShowSettingsResetPromptWithDelay));
- }
}
// Updates all Progressive Web App launchers in |profile_dir| to the latest
diff --git a/chrome/browser/download/bubble/download_bubble_controller.cc b/chrome/browser/download/bubble/download_bubble_controller.cc
--- a/chrome/browser/download/bubble/download_bubble_controller.cc
+++ b/chrome/browser/download/bubble/download_bubble_controller.cc
@@ -458,8 +458,10 @@ void DownloadBubbleUIController::ProcessDownloadButtonPress(
commands.ExecuteCommand(command);
break;
case DownloadCommands::REVIEW:
+#if BUILDFLAG(FULL_SAFE_BROWSING)
model->ReviewScanningVerdict(
browser_->tab_strip_model()->GetActiveWebContents());
+#endif
break;
case DownloadCommands::RETRY:
RetryDownload(model, command);
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -880,21 +880,11 @@ void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) {
content::DownloadItemUtils::GetWebContents(download);
Browser* browser =
web_contents ? chrome::FindBrowserWithWebContents(web_contents) : nullptr;
- std::unique_ptr<chrome::ScopedTabbedBrowserDisplayer> browser_displayer;
- if (!browser ||
- !browser->CanSupportWindowFeature(Browser::FEATURE_TABSTRIP)) {
- browser_displayer =
- std::make_unique<chrome::ScopedTabbedBrowserDisplayer>(profile_);
- browser = browser_displayer->browser();
- }
content::OpenURLParams params(
net::FilePathToFileURL(download->GetTargetFilePath()),
content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui::PAGE_TRANSITION_LINK, false);
- if (download->GetMimeType() == "application/x-x509-user-cert")
- chrome::ShowSettingsSubPage(browser, "certificates");
- else
browser->OpenURL(params);
#endif // BUILDFLAG(IS_ANDROID)
}
@@ -942,7 +932,7 @@ void ChromeDownloadManagerDelegate::ShowDownloadInShell(
std::string
ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() {
- return std::string(chrome::kApplicationClientIDStringForAVScanning);
+ return std::string();
}
#if BUILDFLAG(FULL_SAFE_BROWSING)
@@ -1706,8 +1696,8 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAllowed(
DCHECK(download_item);
DCHECK(download_item->IsSavePackageDownload());
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_MAC)
+#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+ BUILDFLAG(IS_MAC)) && BUILDFLAG(FULL_SAFE_BROWSING)
absl::optional<enterprise_connectors::AnalysisSettings> settings =
safe_browsing::DeepScanningRequest::ShouldUploadBinary(download_item);
diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -900,6 +900,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommands* download_commands,
DownloadUIModel::ExecuteCommand(download_commands, command);
break;
case DownloadCommands::DEEP_SCAN:
+#if BUILDFLAG(FULL_SAFE_BROWSING)
safe_browsing::SafeBrowsingService* sb_service =
g_browser_process->safe_browsing_service();
if (!sb_service)
@@ -932,107 +933,17 @@ void DownloadItemModel::ExecuteCommand(DownloadCommands* download_commands,
safe_browsing::DeepScanningRequest::DeepScanTrigger::
TRIGGER_APP_PROMPT,
safe_browsing::DownloadCheckResult::UNKNOWN, std::move(settings));
+#endif
break;
}
}
DownloadItemModel::BubbleUIInfo
DownloadItemModel::GetBubbleUIInfoForTailoredWarning() const {
- download::DownloadDangerType danger_type = GetDangerType();
- TailoredVerdict tailored_verdict = safe_browsing::DownloadProtectionService::
- GetDownloadProtectionTailoredVerdict(download_);
-
- // Suspicious archives
- if (danger_type == download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT &&
- tailored_verdict.tailored_verdict_type() ==
- TailoredVerdict::SUSPICIOUS_ARCHIVE) {
- return DownloadUIModel::BubbleUIInfo(
- l10n_util::GetStringUTF16(
- IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_SUSPICIOUS_ARCHIVE))
- .AddIconAndColor(vector_icons::kNotSecureWarningIcon,
- ui::kColorAlertMediumSeverity)
- .AddPrimaryButton(DownloadCommands::Command::DISCARD)
- .AddSubpageButton(l10n_util::GetStringUTF16(IDS_DOWNLOAD_BUBBLE_DELETE),
- DownloadCommands::Command::DISCARD,
- /*is_prominent=*/true)
- .AddSubpageButton(
- l10n_util::GetStringUTF16(IDS_DOWNLOAD_BUBBLE_CONTINUE),
- DownloadCommands::Command::KEEP,
- /*is_prominent=*/false);
- }
-
- // Cookie theft
- if (danger_type ==
- download::DOWNLOAD_DANGER_TYPE_DANGEROUS_ACCOUNT_COMPROMISE &&
- tailored_verdict.tailored_verdict_type() ==
- TailoredVerdict::COOKIE_THEFT) {
- if (base::Contains(tailored_verdict.adjustments(),
- TailoredVerdict::ACCOUNT_INFO_STRING)) {
- auto* identity_manager = IdentityManagerFactory::GetForProfile(profile());
- std::string email =
- identity_manager
- ? identity_manager
- ->GetPrimaryAccountInfo(signin::ConsentLevel::kSignin)
- .email
- : "";
- base::UmaHistogramBoolean(
- "SBClientDownload.TailoredWarning.HasVaidEmailForAccountInfo",
- !email.empty());
- if (!email.empty()) {
- return DownloadUIModel::BubbleUIInfo(
- l10n_util::GetStringFUTF16(
- IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_COOKIE_THEFT_AND_ACCOUNT,
- base::ASCIIToUTF16(email)))
- .AddIconAndColor(vector_icons::kDangerousIcon,
- ui::kColorAlertHighSeverity)
- .AddPrimaryButton(DownloadCommands::Command::DISCARD)
- .AddSubpageButton(
- l10n_util::GetStringUTF16(IDS_DOWNLOAD_BUBBLE_DELETE),
- DownloadCommands::Command::DISCARD,
- /*is_prominent=*/true);
- }
- }
- return DownloadUIModel::BubbleUIInfo(
- l10n_util::GetStringUTF16(
- IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_COOKIE_THEFT))
- .AddIconAndColor(vector_icons::kDangerousIcon,
- ui::kColorAlertHighSeverity)
- .AddPrimaryButton(DownloadCommands::Command::DISCARD)
- .AddSubpageButton(l10n_util::GetStringUTF16(IDS_DOWNLOAD_BUBBLE_DELETE),
- DownloadCommands::Command::DISCARD,
- /*is_prominent=*/true);
- }
-
- NOTREACHED();
return DownloadUIModel::BubbleUIInfo();
}
bool DownloadItemModel::ShouldShowTailoredWarning() const {
- if (!IsBubbleV2Enabled() ||
- !base::FeatureList::IsEnabled(safe_browsing::kDownloadTailoredWarnings)) {
- return false;
- }
-
- static const struct ValidCombination {
- download::DownloadDangerType danger_type;
- TailoredVerdict::TailoredVerdictType tailored_verdict_type;
- } kValidTailoredWarningCombinations[]{
- {download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT,
- TailoredVerdict::SUSPICIOUS_ARCHIVE},
- {download::DOWNLOAD_DANGER_TYPE_DANGEROUS_ACCOUNT_COMPROMISE,
- TailoredVerdict::COOKIE_THEFT}};
-
- download::DownloadDangerType danger_type = GetDangerType();
- TailoredVerdict tailored_verdict = safe_browsing::DownloadProtectionService::
- GetDownloadProtectionTailoredVerdict(download_);
- for (const auto& combination : kValidTailoredWarningCombinations) {
- if (danger_type == combination.danger_type &&
- tailored_verdict.tailored_verdict_type() ==
- combination.tailored_verdict_type) {
- return true;
- }
- }
-
return false;
}
diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
--- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
+++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
@@ -90,15 +90,9 @@ StringAnalysisRequest::StringAnalysisRequest(
data_.contents = std::move(text);
result_ = BinaryUploadService::Result::SUCCESS;
}
- safe_browsing::IncrementCrashKey(
- safe_browsing::ScanningCrashKey::PENDING_TEXT_UPLOADS);
- safe_browsing::IncrementCrashKey(
- safe_browsing::ScanningCrashKey::TOTAL_TEXT_UPLOADS);
}
StringAnalysisRequest::~StringAnalysisRequest() {
- safe_browsing::DecrementCrashKey(
- safe_browsing::ScanningCrashKey::PENDING_TEXT_UPLOADS);
}
void StringAnalysisRequest::GetRequestData(DataCallback callback) {
@@ -125,15 +119,6 @@ void ContentAnalysisDelegate::BypassWarnings(
// Mark the full text as complying and report a warning bypass.
if (text_warning_) {
std::fill(result_.text_results.begin(), result_.text_results.end(), true);
-
- int64_t content_size = 0;
- for (const std::string& entry : data_.text)
- content_size += entry.size();
-
- ReportAnalysisConnectorWarningBypass(
- profile_, url_, "", "", "Text data", std::string(), "text/plain",
- extensions::SafeBrowsingPrivateEventRouter::kTriggerWebContentUpload,
- access_point_, content_size, text_response_, user_justification);
}
if (!warned_file_indices_.empty()) {
@@ -147,12 +132,6 @@ void ContentAnalysisDelegate::BypassWarnings(
// Mark the printed page as complying and report a warning bypass.
if (page_warning_) {
result_.page_result = true;
-
- ReportAnalysisConnectorWarningBypass(
- profile_, url_, "", "", title_, /*sha256*/ std::string(),
- /*mime_type*/ std::string(),
- extensions::SafeBrowsingPrivateEventRouter::kTriggerPagePrint,
- access_point_, /*content_size*/ -1, page_response_, user_justification);
}
RunCallback();
@@ -162,15 +141,6 @@ void ContentAnalysisDelegate::Cancel(bool warning) {
if (callback_.is_null())
return;
- // Don't report this upload as cancelled if the user didn't bypass the
- // warning.
- if (!warning) {
- RecordDeepScanMetrics(
- data_.settings.cloud_or_local_settings.is_cloud_analysis(),
- access_point_, base::TimeTicks::Now() - upload_start_time_, 0,
- "CancelledByUser", false);
- }
-
// Ask the binary upload service to cancel requests if it can.
auto cancel = std::make_unique<BinaryUploadService::CancelRequests>(
data_.settings.cloud_or_local_settings);
@@ -334,8 +304,7 @@ ContentAnalysisDelegate::ContentAnalysisDelegate(
CompletionCallback callback,
safe_browsing::DeepScanAccessPoint access_point)
: data_(std::move(data)),
- callback_(std::move(callback)),
- access_point_(access_point) {
+ callback_(std::move(callback)) {
DCHECK(web_contents);
profile_ = Profile::FromBrowserContext(web_contents->GetBrowserContext());
url_ = web_contents->GetLastCommittedURL();
@@ -355,14 +324,6 @@ void ContentAnalysisDelegate::StringRequestCallback(
if (result == safe_browsing::BinaryUploadService::Result::SUCCESS)
final_actions_[response.request_token()] = GetAckFinalAction(response);
- int64_t content_size = 0;
- for (const std::string& entry : data_.text)
- content_size += entry.size();
- RecordDeepScanMetrics(
- data_.settings.cloud_or_local_settings.is_cloud_analysis(), access_point_,
- base::TimeTicks::Now() - upload_start_time_, content_size, result,
- response);
-
text_request_complete_ = true;
RequestHandlerResult request_handler_result =
@@ -375,12 +336,6 @@ void ContentAnalysisDelegate::StringRequestCallback(
std::fill(result_.text_results.begin(), result_.text_results.end(),
text_complies);
- MaybeReportDeepScanningVerdict(
- profile_, url_, "", "", "Text data", std::string(), "text/plain",
- extensions::SafeBrowsingPrivateEventRouter::kTriggerWebContentUpload,
- access_point_, content_size, result, response,
- CalculateEventResult(data_.settings, text_complies, should_warn));
-
UpdateFinalResult(request_handler_result.final_result,
request_handler_result.tag);
@@ -440,11 +395,6 @@ void ContentAnalysisDelegate::PageRequestCallback(
if (result == safe_browsing::BinaryUploadService::Result::SUCCESS)
final_actions_[response.request_token()] = GetAckFinalAction(response);
- RecordDeepScanMetrics(
- data_.settings.cloud_or_local_settings.is_cloud_analysis(), access_point_,
- base::TimeTicks::Now() - upload_start_time_, page_size_bytes_, result,
- response);
-
page_request_complete_ = true;
RequestHandlerResult request_handler_result =
@@ -454,13 +404,6 @@ void ContentAnalysisDelegate::PageRequestCallback(
bool should_warn = request_handler_result.final_result ==
FinalContentAnalysisResult::WARNING;
- MaybeReportDeepScanningVerdict(
- profile_, url_, "", "", title_, /*sha256*/ std::string(),
- /*mime_type*/ std::string(),
- extensions::SafeBrowsingPrivateEventRouter::kTriggerPagePrint,
- access_point_, /*content_size*/ -1, result, response,
- CalculateEventResult(data_.settings, result_.page_result, should_warn));
-
UpdateFinalResult(request_handler_result.final_result,
request_handler_result.tag);
@@ -479,19 +422,7 @@ bool ContentAnalysisDelegate::UploadData() {
PrepareTextRequest();
PreparePageRequest();
- if (!data_.paths.empty()) {
- // Passing the settings using a reference is safe here, because
- // MultiFileRequestHandler is owned by this class.
- files_request_handler_ = FilesRequestHandler::Create(
- GetBinaryUploadService(), profile_, data_.settings, url_, "", "",
- user_action_id_, access_point_, data_.paths,
- base::BindOnce(&ContentAnalysisDelegate::FilesRequestCallback,
- GetWeakPtr()));
- files_request_complete_ = !files_request_handler_->UploadData();
- } else {
- // If no files should be uploaded, the file request is complete.
- files_request_complete_ = true;
- }
+ files_request_complete_ = true;
data_uploaded_ = true;
// Do not add code under this comment. The above line should be the last thing
// this function does before the return statement.
@@ -501,52 +432,9 @@ bool ContentAnalysisDelegate::UploadData() {
}
void ContentAnalysisDelegate::PrepareTextRequest() {
- std::string full_text;
- for (const std::string& text : data_.text)
- full_text.append(text);
-
- // The request is considered complete if there is no text or if the text is
- // too small compared to the minimum size. This means a minimum_data_size of
- // 0 is equivalent to no minimum, as the second part of the "or" will always
- // be false.
- text_request_complete_ =
- full_text.empty() || full_text.size() < data_.settings.minimum_data_size;
-
- if (!full_text.empty()) {
- base::UmaHistogramCustomCounts("Enterprise.OnBulkDataEntry.DataSize",
- full_text.size(),
- /*min=*/1,
- /*max=*/51 * 1024 * 1024,
- /*buckets=*/50);
- }
-
- if (!text_request_complete_) {
- auto request = std::make_unique<StringAnalysisRequest>(
- data_.settings.cloud_or_local_settings, std::move(full_text),
- base::BindOnce(&ContentAnalysisDelegate::StringRequestCallback,
- weak_ptr_factory_.GetWeakPtr()));
-
- PrepareRequest(enterprise_connectors::BULK_DATA_ENTRY, request.get());
- UploadTextForDeepScanning(std::move(request));
- }
}
void ContentAnalysisDelegate::PreparePageRequest() {
- // The request is considered complete if the mapped region is invalid since it
- // prevents scanning.
- page_request_complete_ = !data_.page.IsValid();
-
- if (!page_request_complete_) {
- page_size_bytes_ = data_.page.GetSize();
- auto request = std::make_unique<PagePrintAnalysisRequest>(
- data_.settings, std::move(data_.page),
- base::BindOnce(&ContentAnalysisDelegate::PageRequestCallback,
- weak_ptr_factory_.GetWeakPtr()));
-
- PrepareRequest(enterprise_connectors::PRINT, request.get());
- request->set_filename(title_);
- UploadPageForDeepScanning(std::move(request));
- }
}
// This method only prepares requests for print and paste events. File events
@@ -555,31 +443,6 @@ void ContentAnalysisDelegate::PreparePageRequest() {
void ContentAnalysisDelegate::PrepareRequest(
enterprise_connectors::AnalysisConnector connector,
BinaryUploadService::Request* request) {
- if (data_.settings.cloud_or_local_settings.is_cloud_analysis()) {
- request->set_device_token(
- data_.settings.cloud_or_local_settings.dm_token());
- }
-
- // Include tab page title, user action id, and count of requests per user
- // action in local content analysis requests.
- if (data_.settings.cloud_or_local_settings.is_local_analysis()) {
- request->set_tab_title(title_);
- request->set_user_action_id(user_action_id_);
- // Set request count to 1 for print/paste event. Request count for file
- // events are set in
- // chrome/browser/enterprise/connectors/analysis/request_handler_base.cc
- request->set_user_action_requests_count(1);
- }
-
- request->set_analysis_connector(connector);
- request->set_email(safe_browsing::GetProfileEmail(profile_));
- request->set_url(data_.url.spec());
- request->set_tab_url(data_.url);
- request->set_per_profile_request(data_.settings.per_profile);
- for (const auto& tag : data_.settings.tags)
- request->add_tag(tag.first);
- if (data_.settings.client_metadata)
- request->set_client_metadata(*data_.settings.client_metadata);
}
void ContentAnalysisDelegate::FillAllResultsWith(bool status) {
@@ -589,8 +452,7 @@ void ContentAnalysisDelegate::FillAllResultsWith(bool status) {
}
BinaryUploadService* ContentAnalysisDelegate::GetBinaryUploadService() {
- return safe_browsing::BinaryUploadService::GetForProfile(profile_,
- data_.settings);
+ return nullptr;
}
void ContentAnalysisDelegate::UploadTextForDeepScanning(
@@ -664,26 +526,6 @@ void ContentAnalysisDelegate::UpdateFinalResult(
}
void ContentAnalysisDelegate::AckAllRequests() {
- if (!OnAckAllRequestsStorage()->is_null())
- std::move(*OnAckAllRequestsStorage()).Run(final_actions_);
-
- BinaryUploadService* upload_service = GetBinaryUploadService();
- if (!upload_service)
- return;
-
- for (const auto& token_and_action : final_actions_) {
- // Only have files that have a request token. Not having one implies that
- // the agent never received the request for some reason (size, encryption,
- // etc.) so it doesn't make sense to send an ack.
- if (!token_and_action.first.empty()) {
- auto ack = std::make_unique<safe_browsing::BinaryUploadService::Ack>(
- data_.settings.cloud_or_local_settings);
- ack->set_request_token(token_and_action.first);
- ack->set_status(ContentAnalysisAcknowledgement::SUCCESS);
- ack->set_final_action(token_and_action.second);
- upload_service->MaybeAcknowledge(std::move(ack));
- }
- }
}
} // namespace enterprise_connectors
diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h
--- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h
+++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h
@@ -343,10 +343,6 @@ class ContentAnalysisDelegate : public ContentAnalysisDelegateBase {
bool page_warning_ = false;
enterprise_connectors::ContentAnalysisResponse page_response_;
- // Stores the scanned page's size since it moves from `data_` to be uploaded.
- // TODO(crbug.com/1324892): Move to PageRequestHandler.
- int64_t page_size_bytes_ = 0;
-
// Set to true once the scan of text has completed. If the scan request has
// no text requiring deep scanning, this is set to true immediately.
bool text_request_complete_ = false;
@@ -366,9 +362,6 @@ class ContentAnalysisDelegate : public ContentAnalysisDelegateBase {
// Pointer to UI when enabled.
raw_ptr<ContentAnalysisDialog> dialog_ = nullptr;
- // Access point to use to record UMA metrics.
- safe_browsing::DeepScanAccessPoint access_point_;
-
// Scanning result to be shown to the user once every request is done.
FinalContentAnalysisResult final_result_ =
FinalContentAnalysisResult::SUCCESS;
diff --git a/chrome/browser/enterprise/connectors/analysis/request_handler_base.cc b/chrome/browser/enterprise/connectors/analysis/request_handler_base.cc
--- a/chrome/browser/enterprise/connectors/analysis/request_handler_base.cc
+++ b/chrome/browser/enterprise/connectors/analysis/request_handler_base.cc
@@ -48,26 +48,6 @@ void RequestHandlerBase::AppendFinalActionsTo(
void RequestHandlerBase::PrepareRequest(
enterprise_connectors::AnalysisConnector connector,
safe_browsing::BinaryUploadService::Request* request) {
- if (analysis_settings_->cloud_or_local_settings.is_cloud_analysis()) {
- request->set_device_token(
- analysis_settings_->cloud_or_local_settings.dm_token());
- }
- if (analysis_settings_->cloud_or_local_settings.is_local_analysis()) {
- request->set_user_action_id(user_action_id_);
- request->set_user_action_requests_count(user_action_requests_count_);
- }
-
- request->set_analysis_connector(connector);
- request->set_email(safe_browsing::GetProfileEmail(profile_));
- request->set_url(url_.spec());
- request->set_source(source_);
- request->set_destination(destination_);
- request->set_tab_url(url_);
- request->set_per_profile_request(analysis_settings_->per_profile);
- for (const auto& tag : analysis_settings_->tags)
- request->add_tag(tag.first);
- if (analysis_settings_->client_metadata)
- request->set_client_metadata(*analysis_settings_->client_metadata);
}
safe_browsing::BinaryUploadService*
diff --git a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc b/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
--- a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
+++ b/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
@@ -338,6 +338,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp(
const enterprise_connectors::ReportingSettings& settings,
base::Value::Dict event,
const base::Time& time) {
+ if ((true)) return;
if (rejected_dm_token_timers_.contains(settings.dm_token)) {
return;
}
@@ -406,7 +407,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp(
}
std::string RealtimeReportingClient::GetProfileUserName() const {
- return safe_browsing::GetProfileEmail(identity_manager_);
+ return "";
}
#if BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -747,9 +747,6 @@ static_library("extensions") {
# TODO(crbug.com/1065748): Remove this circular dependency.
"//chrome/browser/web_applications/extensions",
-
- # TODO(crbug/925153): Remove this circular dependency.
- "//chrome/browser/safe_browsing",
]
# Since browser and browser_extensions actually depend on each other,
@@ -801,8 +798,6 @@ static_library("extensions") {
"//chrome/browser/profiles:profile",
"//chrome/browser/resource_coordinator:intervention_policy_database_proto",
"//chrome/browser/resource_coordinator:mojo_bindings",
- "//chrome/browser/safe_browsing",
- "//chrome/browser/safe_browsing:metrics_collector",
"//chrome/browser/ui/tabs:tab_enums",
"//chrome/browser/web_applications",
"//components/adblock/content:browser",
diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/browser/extensions/api/cookies/cookies_api.cc
--- a/chrome/browser/extensions/api/cookies/cookies_api.cc
+++ b/chrome/browser/extensions/api/cookies/cookies_api.cc
@@ -285,21 +285,6 @@ void CookiesGetFunction::GetCookieListCallback(
}
void CookiesGetFunction::NotifyExtensionTelemetry() {
- auto* telemetry_service =
- safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile(
- Profile::FromBrowserContext(browser_context()));
-
- if (!telemetry_service || !telemetry_service->enabled() ||
- !base::FeatureList::IsEnabled(
- safe_browsing::kExtensionTelemetryCookiesGetSignal)) {
- return;
- }
-
- auto cookies_get_signal = std::make_unique<safe_browsing::CookiesGetSignal>(
- extension_id(), parsed_args_->details.name,
- parsed_args_->details.store_id.value_or(std::string()),
- parsed_args_->details.url);
- telemetry_service->AddSignal(std::move(cookies_get_signal));
}
CookiesGetAllFunction::CookiesGetAllFunction() {
@@ -377,26 +362,6 @@ void CookiesGetAllFunction::GetCookieListCallback(
}
void CookiesGetAllFunction::NotifyExtensionTelemetry() {
- auto* telemetry_service =
- safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile(
- Profile::FromBrowserContext(browser_context()));
-
- if (!telemetry_service || !telemetry_service->enabled() ||
- !base::FeatureList::IsEnabled(
- safe_browsing::kExtensionTelemetryCookiesGetAllSignal)) {
- return;
- }
-
- auto cookies_get_all_signal =
- std::make_unique<safe_browsing::CookiesGetAllSignal>(
- extension_id(), parsed_args_->details.domain.value_or(std::string()),
- parsed_args_->details.name.value_or(std::string()),
- parsed_args_->details.path.value_or(std::string()),
- parsed_args_->details.secure.value_or(false),
- parsed_args_->details.store_id.value_or(std::string()),
- parsed_args_->details.url.value_or(std::string()),
- parsed_args_->details.session.value_or(false));
- telemetry_service->AddSignal(std::move(cookies_get_all_signal));
}
CookiesSetFunction::CookiesSetFunction()
diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc
--- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc
+++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc
@@ -55,8 +55,7 @@ SafeBrowsingPrivateGetReferrerChainFunction::Run() {
}
Profile* profile = Profile::FromBrowserContext(browser_context());
- if (!SafeBrowsingNavigationObserverManager::IsEnabledAndReady(
- profile->GetPrefs(), g_browser_process->safe_browsing_service()))
+ if ((true))
return RespondNow(NoArguments());
SafeBrowsingNavigationObserverManager* navigation_observer_manager =
diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
--- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
+++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
@@ -359,10 +359,7 @@ void SafeBrowsingPrivateEventRouter::OnPolicySpecifiedPasswordReuseDetected(
event.Set(kKeyUserName, params.user_name);
event.Set(kKeyIsPhishingUrl, params.is_phishing_url);
event.Set(kKeyProfileUserName, GetProfileUserName());
- event.Set(kKeyEventResult,
- safe_browsing::EventResultToString(
- warning_shown ? safe_browsing::EventResult::WARNED
- : safe_browsing::EventResult::ALLOWED));
+ event.Set(kKeyEventResult, "EVENT_RESULT_ALLOWED");
reporting_client_->ReportRealtimeEvent(
kKeyPasswordReuseEvent, std::move(settings.value()), std::move(event));
@@ -442,8 +439,7 @@ void SafeBrowsingPrivateEventRouter::OnDangerousDownloadOpened(
event.Set(kKeyContentSize, base::Int64ToValue(content_size));
}
event.Set(kKeyTrigger, kTriggerFileDownload);
- event.Set(kKeyEventResult, safe_browsing::EventResultToString(
- safe_browsing::EventResult::BYPASSED));
+ event.Set(kKeyEventResult, "EVENT_RESULT_BYPASSED");
event.Set(kKeyClickedThrough, true);
event.Set(kKeyThreatType, DangerTypeToThreatType(danger_type));
// The scan ID can be empty when the reported dangerous download is from a
@@ -487,22 +483,6 @@ void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialShown(
settings->enabled_event_names.count(kKeyInterstitialEvent) == 0) {
return;
}
-
- PrefService* prefs = Profile::FromBrowserContext(context_)->GetPrefs();
- safe_browsing::EventResult event_result =
- prefs->GetBoolean(prefs::kSafeBrowsingProceedAnywayDisabled)
- ? safe_browsing::EventResult::BLOCKED
- : safe_browsing::EventResult::WARNED;
- base::Value::Dict event;
- event.Set(kKeyUrl, params.url);
- event.Set(kKeyReason, params.reason);
- event.Set(kKeyNetErrorCode, net_error_code);
- event.Set(kKeyProfileUserName, params.user_name);
- event.Set(kKeyClickedThrough, false);
- event.Set(kKeyEventResult, safe_browsing::EventResultToString(event_result));
-
- reporting_client_->ReportRealtimeEvent(
- kKeyInterstitialEvent, std::move(settings.value()), std::move(event));
}
void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialProceeded(
@@ -542,8 +522,7 @@ void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialProceeded(
event.Set(kKeyNetErrorCode, net_error_code);
event.Set(kKeyProfileUserName, params.user_name);
event.Set(kKeyClickedThrough, true);
- event.Set(kKeyEventResult, safe_browsing::EventResultToString(
- safe_browsing::EventResult::BYPASSED));
+ event.Set(kKeyEventResult, "");
reporting_client_->ReportRealtimeEvent(
kKeyInterstitialEvent, std::move(settings.value()), std::move(event));
@@ -613,7 +592,7 @@ void SafeBrowsingPrivateEventRouter::OnDangerousDeepScanningResult(
event.Set(kKeyContentSize, base::Int64ToValue(content_size));
}
event.Set(kKeyTrigger, trigger);
- event.Set(kKeyEventResult, safe_browsing::EventResultToString(event_result));
+ event.Set(kKeyEventResult, "");
event.Set(kKeyClickedThrough,
event_result == safe_browsing::EventResult::BYPASSED);
if (!malware_family.empty()) {
@@ -669,7 +648,7 @@ void SafeBrowsingPrivateEventRouter::OnSensitiveDataEvent(
event.Set(kKeyContentSize, base::Int64ToValue(content_size));
}
event.Set(kKeyTrigger, trigger);
- event.Set(kKeyEventResult, safe_browsing::EventResultToString(event_result));
+ event.Set(kKeyEventResult, "");
event.Set(kKeyClickedThrough,
event_result == safe_browsing::EventResult::BYPASSED);
if (!result.evidence_locker_filepath().empty()) {
@@ -717,8 +696,7 @@ void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorWarningBypassed(
event.Set(kKeyContentSize, base::Int64ToValue(content_size));
}
event.Set(kKeyTrigger, trigger);
- event.Set(kKeyEventResult, safe_browsing::EventResultToString(
- safe_browsing::EventResult::BYPASSED));
+ event.Set(kKeyEventResult, "");
event.Set(kKeyClickedThrough, true);
if (!result.evidence_locker_filepath().empty()) {
event.Set(kKeyEvidenceLockerFilePath, result.evidence_locker_filepath());
@@ -768,7 +746,7 @@ void SafeBrowsingPrivateEventRouter::OnUnscannedFileEvent(
event.Set(kKeyContentSize, base::Int64ToValue(content_size));
}
event.Set(kKeyTrigger, trigger);
- event.Set(kKeyEventResult, safe_browsing::EventResultToString(event_result));
+ event.Set(kKeyEventResult, "");
event.Set(kKeyClickedThrough,
event_result == safe_browsing::EventResult::BYPASSED);
@@ -820,7 +798,7 @@ void SafeBrowsingPrivateEventRouter::OnDangerousDownloadEvent(
event.Set(kKeyContentSize, base::Int64ToValue(content_size));
}
event.Set(kKeyTrigger, kTriggerFileDownload);
- event.Set(kKeyEventResult, safe_browsing::EventResultToString(event_result));
+ event.Set(kKeyEventResult, "");
// The scan ID can be empty when the reported dangerous download is from a
// Safe Browsing verdict.
@@ -875,8 +853,7 @@ void SafeBrowsingPrivateEventRouter::OnDangerousDownloadWarningBypassed(
event.Set(kKeyContentSize, base::Int64ToValue(content_size));
}
event.Set(kKeyTrigger, kTriggerFileDownload);
- event.Set(kKeyEventResult, safe_browsing::EventResultToString(
- safe_browsing::EventResult::BYPASSED));
+ event.Set(kKeyEventResult, "");
// The scan ID can be empty when the reported dangerous download is from a
// Safe Browsing verdict.
if (!scan_id.empty()) {
@@ -979,7 +956,6 @@ void SafeBrowsingPrivateEventRouter::OnUrlFilteringInterstitial(
event_result == safe_browsing::EventResult::BYPASSED);
event.Set(kKeyThreatType, threat_type);
AddTriggeredRuleInfoToUrlFilteringInterstitialEvent(response, event);
- event.Set(kKeyEventResult, safe_browsing::EventResultToString(event_result));
reporting_client_->ReportRealtimeEvent(kKeyUrlFilteringInterstitialEvent,
std::move(settings.value()),
@@ -992,7 +968,7 @@ void SafeBrowsingPrivateEventRouter::SetIdentityManagerForTesting(
}
std::string SafeBrowsingPrivateEventRouter::GetProfileUserName() const {
- return safe_browsing::GetProfileEmail(identity_manager_);
+ return "";
}
} // namespace extensions
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -721,18 +721,6 @@ void WebstorePrivateBeginInstallWithManifest3Function::OnFrictionPromptDone(
void WebstorePrivateBeginInstallWithManifest3Function::
ReportFrictionAcceptedEvent() {
- if (!profile_) {
- return;
- }
- auto* metrics_collector =
- safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
- profile_);
- // `metrics_collector` can be null in incognito.
- if (metrics_collector) {
- metrics_collector->AddSafeBrowsingEventToPref(
- safe_browsing::SafeBrowsingMetricsCollector::EventType::
- EXTENSION_ALLOWLIST_INSTALL_BYPASS);
- }
}
void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
@@ -1219,8 +1207,7 @@ WebstorePrivateGetReferrerChainFunction::
ExtensionFunction::ResponseAction
WebstorePrivateGetReferrerChainFunction::Run() {
Profile* profile = Profile::FromBrowserContext(browser_context());
- if (!SafeBrowsingNavigationObserverManager::IsEnabledAndReady(
- profile->GetPrefs(), g_browser_process->safe_browsing_service()))
+ if ((true))
return RespondNow(ArgumentList(
api::webstore_private::GetReferrerChain::Results::Create("")));
diff --git a/chrome/browser/extensions/blocklist_state_fetcher.cc b/chrome/browser/extensions/blocklist_state_fetcher.cc
--- a/chrome/browser/extensions/blocklist_state_fetcher.cc
+++ b/chrome/browser/extensions/blocklist_state_fetcher.cc
@@ -38,16 +38,9 @@ BlocklistStateFetcher::~BlocklistStateFetcher() {
void BlocklistStateFetcher::Request(const std::string& id,
RequestCallback callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- if (!safe_browsing_config_) {
- if (g_browser_process && g_browser_process->safe_browsing_service()) {
- SetSafeBrowsingConfig(
- g_browser_process->safe_browsing_service()->GetV4ProtocolConfig());
- } else {
- base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
- FROM_HERE, base::BindOnce(std::move(callback), BLOCKLISTED_UNKNOWN));
- return;
- }
- }
+ base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
+ FROM_HERE, base::BindOnce(std::move(callback), BLOCKLISTED_UNKNOWN));
+ if ((true)) return;
bool request_already_sent = base::Contains(callbacks_, id);
callbacks_.insert(std::make_pair(id, std::move(callback)));
diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -705,56 +705,17 @@ void ChromeExtensionsBrowserClient::NotifyExtensionApiTabExecuteScript(
content::BrowserContext* context,
const ExtensionId& extension_id,
const std::string& code) const {
- auto* telemetry_service =
- safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile(
- Profile::FromBrowserContext(context));
- if (!telemetry_service || !telemetry_service->enabled() ||
- !base::FeatureList::IsEnabled(
- safe_browsing::kExtensionTelemetryTabsExecuteScriptSignal)) {
- return;
- }
-
- auto signal = std::make_unique<safe_browsing::TabsExecuteScriptSignal>(
- extension_id, code);
- telemetry_service->AddSignal(std::move(signal));
}
bool ChromeExtensionsBrowserClient::IsExtensionTelemetryServiceEnabled(
content::BrowserContext* context) const {
- auto* telemetry_service =
- safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile(
- Profile::FromBrowserContext(context));
- return telemetry_service && telemetry_service->enabled();
+ return false;
}
void ChromeExtensionsBrowserClient::NotifyExtensionRemoteHostContacted(
content::BrowserContext* context,
const ExtensionId& extension_id,
const GURL& url) const {
- safe_browsing::RemoteHostInfo::ProtocolType protocol =
- safe_browsing::RemoteHostInfo::UNSPECIFIED;
- if (base::FeatureList::IsEnabled(
- safe_browsing::kExtensionTelemetryReportContactedHosts) &&
- url.SchemeIsHTTPOrHTTPS()) {
- protocol = safe_browsing::RemoteHostInfo::HTTP_HTTPS;
- } else if (base::FeatureList::IsEnabled(
- safe_browsing::
- kExtensionTelemetryReportHostsContactedViaWebSocket) &&
- url.SchemeIsWSOrWSS()) {
- protocol = safe_browsing::RemoteHostInfo::WEBSOCKET;
- } else {
- return;
- }
- auto* telemetry_service =
- safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile(
- Profile::FromBrowserContext(context));
- if (!telemetry_service || !telemetry_service->enabled()) {
- return;
- }
- auto remote_host_signal =
- std::make_unique<safe_browsing::RemoteHostContactedSignal>(extension_id,
- url, protocol);
- telemetry_service->AddSignal(std::move(remote_host_signal));
}
// static
diff --git a/chrome/browser/extensions/extension_allowlist.cc b/chrome/browser/extensions/extension_allowlist.cc
--- a/chrome/browser/extensions/extension_allowlist.cc
+++ b/chrome/browser/extensions/extension_allowlist.cc
@@ -400,15 +400,6 @@ void ExtensionAllowlist::NotifyExtensionAllowlistWarningStateChanged(
}
void ExtensionAllowlist::ReportExtensionReEnabledEvent() {
- auto* metrics_collector =
- safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
- profile_);
- DCHECK(metrics_collector);
- if (metrics_collector) {
- metrics_collector->AddSafeBrowsingEventToPref(
- safe_browsing::SafeBrowsingMetricsCollector::EventType::
- NON_ALLOWLISTED_EXTENSION_RE_ENABLED);
- }
}
} // namespace extensions
diff --git a/chrome/browser/media/webrtc/display_media_access_handler.cc b/chrome/browser/media/webrtc/display_media_access_handler.cc
--- a/chrome/browser/media/webrtc/display_media_access_handler.cc
+++ b/chrome/browser/media/webrtc/display_media_access_handler.cc
@@ -122,7 +122,6 @@ void DisplayMediaAccessHandler::HandleRequest(
blink::mojom::StreamDevicesSet(),
blink::mojom::MediaStreamRequestResult::PERMISSION_DENIED,
/*ui=*/nullptr);
- observer->OnDesktopCaptureRequest();
return;
}
diff --git a/chrome/browser/new_tab_page/modules/safe_browsing/safe_browsing_handler.cc b/chrome/browser/new_tab_page/modules/safe_browsing/safe_browsing_handler.cc
--- a/chrome/browser/new_tab_page/modules/safe_browsing/safe_browsing_handler.cc
+++ b/chrome/browser/new_tab_page/modules/safe_browsing/safe_browsing_handler.cc
@@ -54,8 +54,6 @@ SafeBrowsingHandler::SafeBrowsingHandler(
handler,
Profile* profile)
: handler_(this, std::move(handler)),
- metrics_collector_(
- SafeBrowsingMetricsCollectorFactory::GetForProfile(profile)),
pref_service_(profile->GetPrefs()),
saved_last_cooldown_start_time_(0),
saved_module_shown_count_(0) {}
@@ -80,8 +78,7 @@ void SafeBrowsingHandler::CanShowModule(CanShowModuleCallback callback) {
return;
}
- absl::optional<base::Time> latest_event_time =
- metrics_collector_->GetLatestSecuritySensitiveEventTimestamp();
+ absl::optional<base::Time> latest_event_time;
// Do not show if there is no security sensitive event after the latest
// cooldown.
if (!latest_event_time.has_value() || latest_event_time < cooldown_end) {
diff --git a/chrome/browser/new_tab_page/modules/safe_browsing/safe_browsing_handler.h b/chrome/browser/new_tab_page/modules/safe_browsing/safe_browsing_handler.h
--- a/chrome/browser/new_tab_page/modules/safe_browsing/safe_browsing_handler.h
+++ b/chrome/browser/new_tab_page/modules/safe_browsing/safe_browsing_handler.h
@@ -48,9 +48,6 @@ class SafeBrowsingHandler
friend class SafeBrowsingHandlerTest;
mojo::Receiver<ntp::safe_browsing::mojom::SafeBrowsingHandler> handler_;
- // Unowned copy of SafeBrowsingMetricsCollector, to log metrics and read/write
- // security sensitive events.
- raw_ptr<SafeBrowsingMetricsCollector> metrics_collector_;
// Unowned copy of PrefService, to read/write prefs.
raw_ptr<PrefService> pref_service_;
// Save value of last cooldown start time, in case dismissed module is
diff --git a/chrome/browser/notifications/notification_display_service_impl.cc b/chrome/browser/notifications/notification_display_service_impl.cc
--- a/chrome/browser/notifications/notification_display_service_impl.cc
+++ b/chrome/browser/notifications/notification_display_service_impl.cc
@@ -88,13 +88,6 @@ NotificationDisplayServiceImpl::NotificationDisplayServiceImpl(Profile* profile)
profile_));
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN)
- AddNotificationHandler(
- NotificationHandler::Type::TAILORED_SECURITY,
- std::make_unique<safe_browsing::TailoredSecurityNotificationHandler>());
-#endif
-
#if BUILDFLAG(ENABLE_EXTENSIONS)
AddNotificationHandler(
NotificationHandler::Type::EXTENSION,
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -194,7 +194,7 @@ typedef autofill::SavePasswordProgressLogger Logger;
namespace {
-#if !BUILDFLAG(IS_ANDROID)
+#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_WIN)
static const char kPasswordBreachEntryTrigger[] = "PASSWORD_ENTRY";
constexpr char kExtensionScheme[] = "chrome-extension";
#endif
@@ -220,7 +220,7 @@ void AddToWidgetInputEventObservers(
widget_host->AddInputEventObserver(observer);
}
-#if !BUILDFLAG(IS_ANDROID)
+#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_WIN)
// Retrieves and formats the saved passwords domains from signon_realms.
std::vector<std::string> GetMatchingDomains(
const std::vector<password_manager::MatchingReusedCredential>&
@@ -906,7 +906,7 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
bool password_field_exists,
uint64_t reused_password_hash,
const std::string& domain) {
-#if !BUILDFLAG(IS_ANDROID)
+#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_WIN)
// If the webpage is not an extension page, do nothing.
if (!GURL(domain).SchemeIs(kExtensionScheme)) {
return;
@@ -946,7 +946,18 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
void ChromePasswordManagerClient::LogPasswordReuseDetectedEvent() {
}
-#if !BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_WIN)
+void ChromePasswordManagerClient::MaybeReportEnterpriseLoginEvent(
+ const GURL& url,
+ bool is_federated,
+ const url::Origin& federated_origin,
+ const std::u16string& login_user_name) const {}
+
+void ChromePasswordManagerClient::MaybeReportEnterprisePasswordBreachEvent(
+ const std::vector<std::pair<GURL, std::u16string>>& identities) const {}
+#endif
+
+#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_WIN)
void ChromePasswordManagerClient::MaybeReportEnterpriseLoginEvent(
const GURL& url,
bool is_federated,
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -1986,13 +1986,6 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode,
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope, chrome_schema));
- handlers->AddHandler(std::make_unique<SimpleSchemaValidatingPolicyHandler>(
- key::kExemptDomainFileTypePairsFromFileTypeDownloadWarnings,
- safe_browsing::file_type::prefs::
- kExemptDomainFileTypePairsFromFileTypeDownloadWarnings,
- chrome_schema, SCHEMA_ALLOW_UNKNOWN,
- SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED,
- SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED));
handlers->AddHandler(
std::make_unique<ManagedAccountRestrictionsPolicyHandler>(chrome_schema));
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1634,8 +1634,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
component_updater::RegisterProfilePrefsForSwReporter(registry);
FontPrewarmerTabHelper::RegisterProfilePrefs(registry);
NetworkProfileBubble::RegisterProfilePrefs(registry);
+#if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
safe_browsing::SettingsResetPromptPrefsManager::RegisterProfilePrefs(
registry);
+#endif
safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry);
#endif
diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc
--- a/chrome/browser/printing/print_view_manager.cc
+++ b/chrome/browser/printing/print_view_manager.cc
@@ -269,21 +269,6 @@ void PrintViewManager::OnDlpPrintingRestrictionsChecked(
void PrintViewManager::RejectPrintPreviewRequestIfRestrictedByContentAnalysis(
content::GlobalRenderFrameHostId rfh_id,
base::OnceCallback<void(bool should_proceed)> callback) {
- enterprise_connectors::ContentAnalysisDelegate::Data scanning_data;
- content::RenderFrameHost* rfh = content::RenderFrameHost::FromID(rfh_id);
- if (rfh &&
- base::FeatureList::IsEnabled(features::kEnablePrintContentAnalysis) &&
- enterprise_connectors::ContentAnalysisDelegate::IsEnabled(
- Profile::FromBrowserContext(web_contents()->GetBrowserContext()),
- web_contents()->GetOutermostWebContents()->GetLastCommittedURL(),
- &scanning_data, enterprise_connectors::AnalysisConnector::PRINT)) {
- set_snapshotting_for_content_analysis();
- GetPrintRenderFrame(rfh)->SnapshotForContentAnalysis(base::BindOnce(
- &PrintViewManager::OnGotSnapshotCallback, weak_factory_.GetWeakPtr(),
- std::move(callback), std::move(scanning_data), rfh_id));
- return;
- }
-
std::move(callback).Run(/*should_proceed=*/true);
}
diff --git a/chrome/browser/profiles/profiles_state.cc b/chrome/browser/profiles/profiles_state.cc
--- a/chrome/browser/profiles/profiles_state.cc
+++ b/chrome/browser/profiles/profiles_state.cc
@@ -260,8 +260,6 @@ void RemoveBrowsingDataForProfile(const base::FilePath& profile_path) {
// 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.
- if (!g_browser_process->safe_browsing_service())
- return;
Profile* profile =
g_browser_process->profile_manager()->GetProfileByPath(profile_path);
diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD.gn
--- a/chrome/browser/resources/BUILD.gn
+++ b/chrome/browser/resources/BUILD.gn
@@ -107,7 +107,6 @@ group("resources") {
if (!is_android && !is_chromeos_ash) {
public_deps += [
- "intro:resources",
"signin/profile_picker:resources",
"welcome:resources",
]
diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn
--- a/chrome/browser/safe_browsing/BUILD.gn
+++ b/chrome/browser/safe_browsing/BUILD.gn
@@ -6,7 +6,7 @@ import("//build/config/chromeos/ui_mode.gni")
import("//components/safe_browsing/buildflags.gni")
import("//extensions/buildflags/buildflags.gni")
-static_library("safe_browsing") {
+static_library("safe_browsing_disabled") {
if (false) {
sources = [
"chrome_controller_client.cc",
@@ -443,7 +443,7 @@ static_library("safe_browsing") {
}
}
-source_set("verdict_cache_manager_factory") {
+source_set("verdict_cache_manager_factory_disabled") {
sources = [
"verdict_cache_manager_factory.cc",
"verdict_cache_manager_factory.h",
@@ -466,7 +466,7 @@ source_set("verdict_cache_manager_factory") {
]
}
-static_library("advanced_protection") {
+static_library("advanced_protection_disabled") {
sources = [
"advanced_protection_status_manager.cc",
"advanced_protection_status_manager.h",
@@ -488,7 +488,7 @@ static_library("advanced_protection") {
]
}
-source_set("metrics_collector") {
+source_set("metrics_collector_disabled") {
sources = [
"safe_browsing_metrics_collector_factory.cc",
"safe_browsing_metrics_collector_factory.h",
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/BUILD.gn b/chrome/browser/safe_browsing/chrome_cleaner/BUILD.gn
--- a/chrome/browser/safe_browsing/chrome_cleaner/BUILD.gn
+++ b/chrome/browser/safe_browsing/chrome_cleaner/BUILD.gn
@@ -66,7 +66,6 @@ static_library("chrome_cleaner") {
":public",
"//chrome/browser:browser_process",
"//chrome/browser/profiles:profile",
- "//chrome/browser/safe_browsing",
"//chrome/browser/ui",
"//chrome/common",
"//chrome/installer/util:with_no_strings",
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.cc
--- a/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.cc
+++ b/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.cc
@@ -192,7 +192,6 @@ PostCleanupSettingsResetter::Delegate::~Delegate() {}
void PostCleanupSettingsResetter::Delegate::FetchDefaultSettings(
DefaultSettingsFetcher::SettingsCallback callback) {
- DefaultSettingsFetcher::FetchDefaultSettings(std::move(callback));
}
PostCleanupSettingsResetter::PostCleanupSettingsResetter() = default;
diff --git a/chrome/browser/safe_browsing/download_protection/file_analyzer.h b/chrome/browser/safe_browsing/download_protection/file_analyzer.h
--- a/chrome/browser/safe_browsing/download_protection/file_analyzer.h
+++ b/chrome/browser/safe_browsing/download_protection/file_analyzer.h
@@ -13,15 +13,10 @@
#include "build/build_config.h"
#include "chrome/common/safe_browsing/binary_feature_extractor.h"
#include "chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.h"
-#include "chrome/services/file_util/public/cpp/sandboxed_seven_zip_analyzer.h"
#include "chrome/services/file_util/public/cpp/sandboxed_zip_analyzer.h"
#include "components/safe_browsing/core/common/proto/csd.pb.h"
#include "third_party/protobuf/src/google/protobuf/repeated_field.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-#include "chrome/services/file_util/public/cpp/sandboxed_document_analyzer.h"
-#endif
-
#if BUILDFLAG(IS_MAC)
#include "chrome/common/safe_browsing/disk_image_type_sniffer_mac.h"
#include "chrome/services/file_util/public/cpp/sandboxed_dmg_analyzer_mac.h"
@@ -106,12 +101,6 @@ class FileAnalyzer {
const safe_browsing::ArchiveAnalyzerResults& archive_results);
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
- void StartExtractDocumentFeatures();
- void OnDocumentAnalysisFinished(
- const DocumentAnalyzerResults& document_results);
-#endif
-
void StartExtractSevenZipFeatures();
void OnSevenZipAnalysisFinished(
const ArchiveAnalyzerResults& archive_results);
@@ -136,15 +125,6 @@ class FileAnalyzer {
dmg_analyzer_{nullptr, base::OnTaskRunnerDeleter(nullptr)};
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
- std::unique_ptr<SandboxedDocumentAnalyzer, base::OnTaskRunnerDeleter>
- document_analyzer_{nullptr, base::OnTaskRunnerDeleter(nullptr)};
- base::TimeTicks document_analysis_start_time_;
-#endif
-
- std::unique_ptr<SandboxedSevenZipAnalyzer, base::OnTaskRunnerDeleter>
- seven_zip_analyzer_{nullptr, base::OnTaskRunnerDeleter(nullptr)};
-
base::WeakPtrFactory<FileAnalyzer> weakptr_factory_{this};
};
diff --git a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
--- a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
+++ b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
@@ -143,15 +143,6 @@ CreateSettingsPageHelper() {
CreateChromeSettingsPageHelper();
}
-void LogSafeBrowsingSecuritySensitiveAction(
- safe_browsing::SafeBrowsingMetricsCollector* metrics_collector) {
- if (metrics_collector) {
- metrics_collector->AddSafeBrowsingEventToPref(
- safe_browsing::SafeBrowsingMetricsCollector::EventType::
- SECURITY_SENSITIVE_SSL_INTERSTITIAL);
- }
-}
-
} // namespace
std::unique_ptr<SSLBlockingPage>
@@ -175,10 +166,6 @@ ChromeSecurityBlockingPageFactory::CreateSSLPage(
Profile::FromBrowserContext(web_contents->GetBrowserContext()));
state->DidDisplayErrorPage(cert_error);
- LogSafeBrowsingSecuritySensitiveAction(
- safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
- Profile::FromBrowserContext(web_contents->GetBrowserContext())));
-
auto controller_client = std::make_unique<SSLErrorControllerClient>(
web_contents, ssl_info, cert_error, request_url,
std::move(metrics_helper), CreateSettingsPageHelper());
@@ -248,10 +235,6 @@ ChromeSecurityBlockingPageFactory::CreateMITMSoftwareBlockingPage(
std::unique_ptr<SSLCertReporter> ssl_cert_reporter,
const net::SSLInfo& ssl_info,
const std::string& mitm_software_name) {
- LogSafeBrowsingSecuritySensitiveAction(
- safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
- Profile::FromBrowserContext(web_contents->GetBrowserContext())));
-
auto page = std::make_unique<MITMSoftwareBlockingPage>(
web_contents, cert_error, request_url, std::move(ssl_cert_reporter),
/*can_show_enhanced_protection_message=*/true, ssl_info,
@@ -273,10 +256,6 @@ ChromeSecurityBlockingPageFactory::CreateBlockedInterceptionBlockingPage(
const GURL& request_url,
std::unique_ptr<SSLCertReporter> ssl_cert_reporter,
const net::SSLInfo& ssl_info) {
- LogSafeBrowsingSecuritySensitiveAction(
- safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
- Profile::FromBrowserContext(web_contents->GetBrowserContext())));
-
auto page = std::make_unique<BlockedInterceptionBlockingPage>(
web_contents, cert_error, request_url, std::move(ssl_cert_reporter),
/*can_show_enhanced_protection_message=*/true, ssl_info,
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -424,7 +424,6 @@ static_library("ui") {
"//chrome/browser/resources/net_internals:resources",
"//chrome/browser/resources/omnibox:resources",
"//chrome/browser/resources/usb_internals:resources",
- "//chrome/browser/safe_browsing",
"//chrome/browser/share",
"//chrome/browser/ui/webui:configs",
"//chrome/browser/ui/webui/omnibox:mojo_bindings",
@@ -680,7 +679,6 @@ static_library("ui") {
# TODO(crbug.com/1158905): Remove this circular dependency.
"//chrome/browser/devtools",
"//chrome/browser/favicon",
- "//chrome/browser/safe_browsing",
"//chrome/browser/profiling_host",
"//chrome/browser/ui/webui:configs",
]
@@ -1793,8 +1791,6 @@ static_library("ui") {
"//chrome/browser/resources/identity_internals:resources",
"//chrome/browser/resources/support_tool:resources",
"//chrome/browser/resources/web_app_internals:resources",
- "//chrome/browser/safe_browsing",
- "//chrome/browser/safe_browsing:advanced_protection",
"//chrome/browser/support_tool:support_tool_proto",
"//chrome/browser/ui/color:color_headers",
"//chrome/browser/ui/color:mixers",
@@ -3654,8 +3650,6 @@ static_library("ui") {
"views/profiles/profile_picker_force_signin_dialog_host.h",
"views/profiles/profile_picker_signed_in_flow_controller.cc",
"views/profiles/profile_picker_signed_in_flow_controller.h",
- "views/profiles/profile_picker_turn_sync_on_delegate.cc",
- "views/profiles/profile_picker_turn_sync_on_delegate.h",
"views/profiles/profile_picker_view.cc",
"views/profiles/profile_picker_view.h",
"views/profiles/profile_picker_web_contents_host.h",
diff --git 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
--- 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
@@ -43,7 +43,6 @@ void JavaScriptTabModalDialogManagerDelegateDesktop::WillRunDialog() {
safe_browsing::SafeBrowsingUserInteractionObserver::FromWebContents(
web_contents_);
if (observer) {
- observer->OnJavaScriptDialog();
}
}
diff --git a/chrome/browser/ui/page_info/chrome_page_info_delegate.cc b/chrome/browser/ui/page_info/chrome_page_info_delegate.cc
--- a/chrome/browser/ui/page_info/chrome_page_info_delegate.cc
+++ b/chrome/browser/ui/page_info/chrome_page_info_delegate.cc
@@ -257,7 +257,6 @@ void ChromePageInfoDelegate::OpenConnectionHelpCenterPage(
}
void ChromePageInfoDelegate::OpenSafetyTipHelpCenterPage() {
- OpenHelpCenterFromSafetyTip(web_contents_);
}
void ChromePageInfoDelegate::OpenContentSettingsExceptions(
diff --git a/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc b/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc
--- a/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc
+++ b/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc
@@ -21,169 +21,10 @@
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "ui/base/clipboard/file_info.h"
-namespace {
-
-void CompletionCallback(
- content::DropData drop_data,
- std::unique_ptr<enterprise_connectors::FilesScanData> files_scan_data,
- content::WebContentsViewDelegate::DropCompletionCallback callback,
- const enterprise_connectors::ContentAnalysisDelegate::Data& data,
- enterprise_connectors::ContentAnalysisDelegate::Result& result) {
- // If there are no negative results, proceed with just `drop_data`.
- bool all_text_results_allowed = !base::Contains(result.text_results, false);
- bool all_file_results_allowed = !base::Contains(result.paths_results, false);
- if (all_text_results_allowed && all_file_results_allowed) {
- std::move(callback).Run(std::move(drop_data));
- return;
- }
-
- // For text drag-drops, block the drop if any result is negative.
- if (!all_text_results_allowed) {
- std::move(callback).Run(absl::nullopt);
- return;
- }
-
- // For file drag-drops, block file paths depending on the verdict obtained for
- // child paths.
- DCHECK(files_scan_data);
- std::set<size_t> file_indexes_to_block =
- files_scan_data->IndexesToBlock(result.paths_results);
-
- // If every file path should be blocked, the drop is aborted, otherwise it
- // continues by blocking sub-elements of the list. When everything is blocked,
- // it implies that no `result.paths_results` is allowed.
- if (file_indexes_to_block.size() == drop_data.filenames.size()) {
- for (size_t i = 0; i < data.paths.size(); ++i)
- result.paths_results[i] = false;
-
- std::move(callback).Run(absl::nullopt);
- return;
- }
-
- // A specific index could be blocked due to its parent folder being
- // blocked and not because it got a bad verdict itself, so `result` needs
- // to be updated to reflect that.
- DCHECK_EQ(data.paths.size(),
- files_scan_data->expanded_paths_indexes().size());
- for (size_t i = 0; i < data.paths.size(); ++i) {
- int parent_index =
- files_scan_data->expanded_paths_indexes().at(data.paths[i]);
- if (file_indexes_to_block.count(parent_index))
- result.paths_results[i] = false;
- }
-
- std::vector<ui::FileInfo> final_filenames;
- for (size_t i = 0; i < drop_data.filenames.size(); ++i) {
- if (file_indexes_to_block.count(i))
- continue;
- final_filenames.push_back(std::move(drop_data.filenames[i]));
- }
-
- drop_data.filenames = std::move(final_filenames);
- std::move(callback).Run(std::move(drop_data));
-}
-
-// Helper class to handle WebContents being destroyed while files are opened in
-// the threadpool. This class deletes itself either when it's no longer needed
-// when ScanData is called, or when its corresponding web contents is destroyed
-// so its weak ptrs are invalidated.
-class HandleDropScanData : public content::WebContentsObserver {
- public:
- HandleDropScanData(
- content::WebContents* web_contents,
- content::DropData drop_data,
- enterprise_connectors::ContentAnalysisDelegate::Data analysis_data,
- content::WebContentsViewDelegate::DropCompletionCallback callback)
- : content::WebContentsObserver(web_contents),
- drop_data_(std::move(drop_data)),
- analysis_data_(std::move(analysis_data)),
- callback_(std::move(callback)) {}
-
- void ScanData(
- std::unique_ptr<enterprise_connectors::FilesScanData> files_scan_data) {
- DCHECK(web_contents());
- if (files_scan_data) {
- for (const auto& path : files_scan_data->expanded_paths()) {
- analysis_data_.paths.push_back(path);
- }
- }
- enterprise_connectors::ContentAnalysisDelegate::CreateForWebContents(
- web_contents(), std::move(analysis_data_),
- base::BindOnce(&CompletionCallback, std::move(drop_data_),
- std::move(files_scan_data), std::move(callback_)),
- safe_browsing::DeepScanAccessPoint::DRAG_AND_DROP);
-
- delete this;
- }
-
- void WebContentsDestroyed() override { delete this; }
-
- base::WeakPtr<HandleDropScanData> GetWeakPtr() {
- return weakptr_factory_.GetWeakPtr();
- }
-
- private:
- content::DropData drop_data_;
- enterprise_connectors::ContentAnalysisDelegate::Data analysis_data_;
- content::WebContentsViewDelegate::DropCompletionCallback callback_;
-
- base::WeakPtrFactory<HandleDropScanData> weakptr_factory_{this};
-};
-
-} // namespace
-
void HandleOnPerformDrop(
content::WebContents* web_contents,
content::DropData drop_data,
content::WebContentsViewDelegate::DropCompletionCallback callback) {
- enterprise_connectors::ContentAnalysisDelegate::Data data;
- Profile* profile =
- Profile::FromBrowserContext(web_contents->GetBrowserContext());
- auto connector =
- drop_data.filenames.empty()
- ? enterprise_connectors::AnalysisConnector::BULK_DATA_ENTRY
- : enterprise_connectors::AnalysisConnector::FILE_ATTACHED;
- if (!enterprise_connectors::ContentAnalysisDelegate::IsEnabled(
- profile, web_contents->GetLastCommittedURL(), &data, connector)) {
std::move(callback).Run(std::move(drop_data));
return;
- }
-
- // Collect the data that needs to be scanned.
- if (!drop_data.url_title.empty())
- data.text.push_back(base::UTF16ToUTF8(drop_data.url_title));
- if (drop_data.text)
- data.text.push_back(base::UTF16ToUTF8(*drop_data.text));
- if (drop_data.html)
- data.text.push_back(base::UTF16ToUTF8(*drop_data.html));
-
- // `callback` should only run asynchronously when scanning is blocking.
- content::WebContentsViewDelegate::DropCompletionCallback scan_callback =
- base::DoNothing();
- if (data.settings.block_until_verdict ==
- enterprise_connectors::BlockUntilVerdict::kBlock) {
- scan_callback = std::move(callback);
- }
-
- // `handle_drop_scan_data` is created on the heap to stay alive regardless of
- // how long the threadpool work takes or in case `web_contents` is destroyed.
- // It deletes itself when `HandleDropScanData::ScanData` is called or when
- // `web_contents` gets destroyed.
- auto* handle_drop_scan_data = new HandleDropScanData(
- web_contents, drop_data, std::move(data), std::move(scan_callback));
- if (drop_data.filenames.empty()) {
- handle_drop_scan_data->ScanData(/*files_scan_data=*/nullptr);
- } else {
- auto files_scan_data =
- std::make_unique<enterprise_connectors::FilesScanData>(
- drop_data.filenames);
- auto* files_scan_data_raw = files_scan_data.get();
- files_scan_data_raw->ExpandPaths(base::BindOnce(
- &HandleDropScanData::ScanData, handle_drop_scan_data->GetWeakPtr(),
- std::move(files_scan_data)));
- }
-
- if (!callback.is_null()) {
- std::move(callback).Run(std::move(drop_data));
- }
}
diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc
--- a/chrome/browser/ui/views/download/download_item_view.cc
+++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -812,21 +812,7 @@ void DownloadItemView::UpdateLabels() {
warning_label_->SizeToFit(GetLabelWidth(*warning_label_));
}
- deep_scanning_label_->SetVisible(mode_ ==
- download::DownloadItemMode::kDeepScanning);
- if (deep_scanning_label_->GetVisible()) {
- const int id = (model_->GetDownloadItem() &&
- safe_browsing::DeepScanningRequest::ShouldUploadBinary(
- model_->GetDownloadItem()))
- ? IDS_PROMPT_DEEP_SCANNING_DOWNLOAD
- : IDS_PROMPT_DEEP_SCANNING_APP_DOWNLOAD;
- const std::u16string filename = ElidedFilename(*deep_scanning_label_);
- size_t filename_offset;
- deep_scanning_label_->SetText(
- l10n_util::GetStringFUTF16(id, filename, &filename_offset));
- StyleFilename(*deep_scanning_label_, filename_offset, filename.length());
- deep_scanning_label_->SizeToFit(GetLabelWidth(*deep_scanning_label_));
- }
+ deep_scanning_label_->SetVisible(false);
}
void DownloadItemView::UpdateButtons() {
@@ -1015,11 +1001,7 @@ ui::ImageModel DownloadItemView::GetIcon() const {
switch (danger_type) {
case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT:
- return safe_browsing::AdvancedProtectionStatusManagerFactory::
- GetForProfile(model_->profile())
- ->IsUnderAdvancedProtection()
- ? kWarning
- : kError;
+ return kError;
case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL:
case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT:
case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST:
@@ -1270,7 +1252,6 @@ void DownloadItemView::ShowContextMenuImpl(const gfx::Rect& rect,
}
void DownloadItemView::OpenDownloadDuringAsyncScanning() {
- model_->CompleteSafeBrowsingScan();
model_->SetOpenWhenComplete(true);
}
diff --git a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
@@ -209,15 +209,6 @@ void DownloadsDOMHandler::DiscardDangerous(const std::string& id) {
!GetMainNotifierManager()->GetBrowserContext()->IsOffTheRecord() &&
base::FeatureList::IsEnabled(
safe_browsing::kSafeBrowsingCsbrrNewDownloadTrigger)) {
- safe_browsing::SafeBrowsingService* sb_service =
- g_browser_process->safe_browsing_service();
- if (sb_service) {
- sb_service->SendDownloadReport(
- download,
- safe_browsing::ClientSafeBrowsingReportRequest::
- DANGEROUS_DOWNLOAD_RECOVERY,
- /*did_proceed=*/false, /*show_download_in_folder=*/absl::nullopt);
- }
}
}
RemoveDownloadInArgs(id);
@@ -454,11 +445,6 @@ void DownloadsDOMHandler::ReviewDangerousRequiringGesture(
}
CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_REVIEW_DANGEROUS);
- download::DownloadItem* download = GetDownloadByStringId(id);
- if (download) {
- DownloadItemModel model(download);
- model.ReviewScanningVerdict(GetWebUIWebContents());
- }
}
// DownloadsDOMHandler, private: --------------------------------------------
@@ -487,12 +473,7 @@ void DownloadsDOMHandler::FinalizeRemovals() {
void DownloadsDOMHandler::ShowDangerPrompt(
download::DownloadItem* dangerous_item) {
- DownloadDangerPrompt* danger_prompt = DownloadDangerPrompt::Create(
- dangerous_item, GetWebUIWebContents(), false,
- base::BindOnce(&DownloadsDOMHandler::DangerPromptDone,
- weak_ptr_factory_.GetWeakPtr(), dangerous_item->GetId()));
- // danger_prompt will delete itself.
- DCHECK(danger_prompt);
+ DangerPromptDone(dangerous_item->GetId(), DownloadDangerPrompt::ACCEPT);
}
void DownloadsDOMHandler::DangerPromptDone(
diff --git a/chrome/browser/ui/webui/downloads/downloads_ui.cc b/chrome/browser/ui/webui/downloads/downloads_ui.cc
--- a/chrome/browser/ui/webui/downloads/downloads_ui.cc
+++ b/chrome/browser/ui/webui/downloads/downloads_ui.cc
@@ -63,10 +63,7 @@ content::WebUIDataSource* CreateAndAddDownloadsUIHTMLSource(Profile* profile) {
source, base::make_span(kDownloadsResources, kDownloadsResourcesSize),
IDR_DOWNLOADS_DOWNLOADS_HTML);
- bool requests_ap_verdicts =
- safe_browsing::AdvancedProtectionStatusManagerFactory::GetForProfile(
- profile)
- ->IsUnderAdvancedProtection();
+ bool requests_ap_verdicts = false;
source->AddBoolean("requestsApVerdicts", requests_ap_verdicts);
static constexpr webui::LocalizedString kStrings[] = {
diff --git a/chrome/browser/ui/webui/intro/intro_ui.cc b/chrome/browser/ui/webui/intro/intro_ui.cc
--- a/chrome/browser/ui/webui/intro/intro_ui.cc
+++ b/chrome/browser/ui/webui/intro/intro_ui.cc
@@ -24,8 +24,6 @@
#include "chrome/grit/chrome_unscaled_resources.h"
#include "chrome/grit/chromium_strings.h"
#include "chrome/grit/generated_resources.h"
-#include "chrome/grit/intro_resources.h"
-#include "chrome/grit/intro_resources_map.h"
#include "chrome/grit/signin_resources.h"
#include "components/signin/public/base/consent_level.h"
#include "components/signin/public/base/signin_buildflags.h"
@@ -37,6 +35,13 @@
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/l10n/l10n_util.h"
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
+#include "chrome/grit/intro_resources.h"
+#include "chrome/grit/intro_resources_map.h"
+#include "chrome/grit/chromium_strings.h"
+#include "chrome/grit/generated_resources.h"
+#endif
+
namespace {
#if BUILDFLAG(IS_CHROMEOS_LACROS)
std::string GetPictureUrl(content::WebUI& web_ui,
@@ -95,12 +100,11 @@ IntroUI::IntroUI(content::WebUI* web_ui) : content::WebUIController(web_ui) {
DCHECK(base::FeatureList::IsEnabled(kForYouFre));
auto* profile = Profile::FromWebUI(web_ui);
- content::WebUIDataSource* source = content::WebUIDataSource::CreateAndAdd(
- profile, chrome::kChromeUIIntroHost);
-
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
webui::SetupWebUIDataSource(
source, base::make_span(kIntroResources, kIntroResourcesSize),
IDR_INTRO_INTRO_HTML);
+#endif
#if BUILDFLAG(ENABLE_DICE_SUPPORT)
int title_id = 0;
@@ -126,25 +130,6 @@ IntroUI::IntroUI(content::WebUI* web_ui) : content::WebUIController(web_ui) {
}
#endif
- webui::LocalizedString localized_strings[] = {
-#if BUILDFLAG(ENABLE_DICE_SUPPORT)
- {"pageTitle", title_id},
- {"pageSubtitle", subtitle_id},
- {"devicesCardTitle", IDS_FRE_DEVICES_CARD_TITLE},
- {"devicesCardDescription", IDS_FRE_DEVICES_CARD_DESCRIPTION},
- {"securityCardTitle", IDS_FRE_SECURITY_CARD_TITLE},
- {"securityCardDescription", IDS_FRE_SECURITY_CARD_DESCRIPTION},
- {"backupCardTitle", IDS_FRE_BACKUP_CARD_TITLE},
- {"backupCardDescription", IDS_FRE_BACKUP_CARD_DESCRIPTION},
- {"declineSignInButtonTitle", IDS_FRE_DECLINE_SIGN_IN_BUTTON_TITLE},
- {"acceptSignInButtonTitle", IDS_FRE_ACCEPT_SIGN_IN_BUTTON_TITLE},
-#endif
-#if BUILDFLAG(IS_CHROMEOS_LACROS)
- {"proceedLabel", IDS_PRIMARY_PROFILE_FIRST_RUN_NEXT_BUTTON_LABEL},
-#endif
- };
- source->AddLocalizedStrings(localized_strings);
-
// TODO(crbug.com/1409028): Replace this function by a call to
// chrome::GetDeviceManagerIdentity()
const bool is_device_managed = chrome::ShouldDisplayManagedUi(profile);
diff --git a/chrome/browser/webshare/share_service_impl.cc b/chrome/browser/webshare/share_service_impl.cc
--- a/chrome/browser/webshare/share_service_impl.cc
+++ b/chrome/browser/webshare/share_service_impl.cc
@@ -17,8 +17,10 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/common/chrome_features.h"
+#if BUILDFLAG(FULL_SAFE_BROWSING)
#include "components/safe_browsing/content/common/file_type_policies.h"
#include "components/safe_browsing/core/browser/db/database_manager.h"
+#endif
#include "content/public/browser/web_contents.h"
#include "mojo/public/cpp/bindings/self_owned_receiver.h"
#include "third_party/blink/public/mojom/permissions_policy/permissions_policy_feature.mojom.h"
@@ -190,6 +192,7 @@ void ShareServiceImpl::Share(const std::string& title,
return;
}
+#if BUILDFLAG(FULL_SAFE_BROWSING)
bool should_check_url = false;
for (auto& file : files) {
if (!file || !file->blob || !file->blob->blob) {
@@ -231,6 +234,7 @@ void ShareServiceImpl::Share(const std::string& title,
std::move(files), std::move(callback)));
return;
}
+#endif
OnSafeBrowsingResultReceived(title, text, share_url, std::move(files),
std::move(callback),
diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni
--- a/chrome/chrome_paks.gni
+++ b/chrome/chrome_paks.gni
@@ -420,12 +420,10 @@ template("chrome_extra_paks") {
}
if (!is_android && !is_chromeos_ash) {
sources += [
- "$root_gen_dir/chrome/intro_resources.pak",
"$root_gen_dir/chrome/profile_picker_resources.pak",
"$root_gen_dir/chrome/welcome_resources.pak",
]
deps += [
- "//chrome/browser/resources/intro:resources",
"//chrome/browser/resources/signin/profile_picker:resources",
"//chrome/browser/resources/welcome:resources",
]
diff --git a/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.cc b/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.cc
--- a/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.cc
+++ b/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.cc
@@ -95,11 +95,6 @@ SandboxedRarAnalyzer::SandboxedRarAnalyzer(
service_(std::move(service)) {
DCHECK(callback_);
DCHECK(!file_path_.value().empty());
- service_->BindSafeArchiveAnalyzer(
- remote_analyzer_.BindNewPipeAndPassReceiver());
- remote_analyzer_.set_disconnect_handler(
- base::BindOnce(&SandboxedRarAnalyzer::AnalyzeFileDone, GetWeakPtr(),
- safe_browsing::ArchiveAnalyzerResults()));
}
void SandboxedRarAnalyzer::Start() {
@@ -121,19 +116,12 @@ SandboxedRarAnalyzer::~SandboxedRarAnalyzer() = default;
void SandboxedRarAnalyzer::AnalyzeFile(base::File file, base::File temp_file) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
DCHECK(!file_path_.value().empty());
- if (remote_analyzer_) {
- remote_analyzer_->AnalyzeRarFile(
- std::move(file), std::move(temp_file),
- base::BindOnce(&SandboxedRarAnalyzer::AnalyzeFileDone, GetWeakPtr()));
- } else {
AnalyzeFileDone(safe_browsing::ArchiveAnalyzerResults());
- }
}
void SandboxedRarAnalyzer::AnalyzeFileDone(
const safe_browsing::ArchiveAnalyzerResults& results) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- remote_analyzer_.reset();
if (callback_) {
std::move(callback_).Run(results);
}
@@ -150,9 +138,7 @@ void SandboxedRarAnalyzer::ReportFileFailure(
}
std::string SandboxedRarAnalyzer::DebugString() const {
- return base::StringPrintf("path: %" PRFilePath "; connected_: %d",
- file_path_.value().c_str(),
- remote_analyzer_.is_connected());
+ return std:string();
}
std::ostream& operator<<(std::ostream& os,
diff --git a/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.h b/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.h
--- a/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.h
+++ b/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.h
@@ -11,7 +11,6 @@
#include "base/memory/weak_ptr.h"
#include "base/task/sequenced_task_runner.h"
#include "chrome/services/file_util/public/mojom/file_util_service.mojom.h"
-#include "chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/remote.h"
@@ -73,7 +72,6 @@ class SandboxedRarAnalyzer {
// Remote interfaces to the file util service. Only used from the UI thread.
mojo::Remote<chrome::mojom::FileUtilService> service_;
- mojo::Remote<chrome::mojom::SafeArchiveAnalyzer> remote_analyzer_;
base::WeakPtrFactory<SandboxedRarAnalyzer> weak_ptr_factory_{this};
};
diff --git a/chrome/services/file_util/public/cpp/sandboxed_zip_analyzer.h b/chrome/services/file_util/public/cpp/sandboxed_zip_analyzer.h
--- a/chrome/services/file_util/public/cpp/sandboxed_zip_analyzer.h
+++ b/chrome/services/file_util/public/cpp/sandboxed_zip_analyzer.h
@@ -10,7 +10,6 @@
#include "base/functional/callback.h"
#include "base/memory/ref_counted_delete_on_sequence.h"
#include "chrome/services/file_util/public/mojom/file_util_service.mojom.h"
-#include "chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/remote.h"
@@ -68,7 +67,6 @@ class SandboxedZipAnalyzer {
// Remote interfaces to the file util service. Only used from the UI thread.
mojo::Remote<chrome::mojom::FileUtilService> service_;
- mojo::Remote<chrome::mojom::SafeArchiveAnalyzer> remote_analyzer_;
base::WeakPtrFactory<SandboxedZipAnalyzer> weak_ptr_factory_{this};
};
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -297,7 +297,6 @@ static_library("test_support") {
"//chrome:strings",
"//chrome/browser:browser_process",
"//chrome/browser:test_support",
- "//chrome/browser/safe_browsing",
"//chrome/browser/sharing/proto",
"//chrome/child",
"//chrome/common:non_code_constants",
@@ -5933,9 +5932,6 @@ test("unit_tests") {
"//chrome/browser/profile_resetter:profile_reset_report_proto",
"//chrome/browser/profiling_host",
"//chrome/browser/push_messaging:budget_proto",
- "//chrome/browser/safe_browsing:advanced_protection",
- "//chrome/browser/safe_browsing:metrics_collector",
- "//chrome/browser/safe_browsing:verdict_cache_manager_factory",
"//chrome/browser/segmentation_platform:test_utils",
"//chrome/browser/share",
"//chrome/browser/sharing/proto",
diff --git a/components/safe_browsing/content/browser/mojo_safe_browsing_impl.cc b/components/safe_browsing/content/browser/mojo_safe_browsing_impl.cc
--- a/components/safe_browsing/content/browser/mojo_safe_browsing_impl.cc
+++ b/components/safe_browsing/content/browser/mojo_safe_browsing_impl.cc
@@ -121,6 +121,7 @@ void MojoSafeBrowsingImpl::MaybeCreate(
return;
}
+ NOTREACHED();
std::unique_ptr<MojoSafeBrowsingImpl> impl(new MojoSafeBrowsingImpl(
std::move(delegate), render_process_id, resource_context));
impl->Clone(std::move(receiver));
diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc
--- a/components/safe_browsing/core/common/safe_browsing_prefs.cc
+++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc
@@ -221,7 +221,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
registry->RegisterIntegerPref(prefs::kPasswordProtectionWarningTrigger,
PASSWORD_PROTECTION_OFF);
registry->RegisterInt64Pref(prefs::kAdvancedProtectionLastRefreshInUs, 0);
- registry->RegisterBooleanPref(prefs::kAdvancedProtectionAllowed, true);
+ registry->RegisterBooleanPref(prefs::kAdvancedProtectionAllowed, false);
registry->RegisterIntegerPref(
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode,
REAL_TIME_CHECK_DISABLED);
diff --git a/printing/buildflags/buildflags.gni b/printing/buildflags/buildflags.gni
--- a/printing/buildflags/buildflags.gni
+++ b/printing/buildflags/buildflags.gni
@@ -44,7 +44,7 @@ declare_args() {
# Enable snapshotting a page when printing for its content to be analyzed for
# sensitive content by enterprise users.
- enable_print_content_analysis = is_chromeos || is_win || is_linux || is_mac
+ enable_print_content_analysis = false
}
declare_args() {
diff --git a/services/preferences/tracked/tracked_persistent_pref_store_factory.cc b/services/preferences/tracked/tracked_persistent_pref_store_factory.cc
--- a/services/preferences/tracked/tracked_persistent_pref_store_factory.cc
+++ b/services/preferences/tracked/tracked_persistent_pref_store_factory.cc
@@ -103,24 +103,18 @@ PersistentPrefStore* CreateTrackedPersistentPrefStore(
}
#endif
- mojo::Remote<prefs::mojom::TrackedPreferenceValidationDelegate>
- validation_delegate;
- validation_delegate.Bind(std::move(config->validation_delegate));
- auto validation_delegate_ref = base::MakeRefCounted<base::RefCountedData<
- mojo::Remote<prefs::mojom::TrackedPreferenceValidationDelegate>>>(
- std::move(validation_delegate));
std::unique_ptr<PrefHashFilter> unprotected_pref_hash_filter(
new PrefHashFilter(CreatePrefHashStore(*config, false),
GetExternalVerificationPrefHashStorePair(
*config, temp_scoped_dir_cleaner),
unprotected_configuration, mojo::NullRemote(),
- validation_delegate_ref, config->reporting_ids_count));
+ nullptr, config->reporting_ids_count));
std::unique_ptr<PrefHashFilter> protected_pref_hash_filter(new PrefHashFilter(
CreatePrefHashStore(*config, true),
GetExternalVerificationPrefHashStorePair(*config,
temp_scoped_dir_cleaner),
protected_configuration, std::move(config->reset_on_load_observer),
- validation_delegate_ref, config->reporting_ids_count));
+ nullptr, config->reporting_ids_count));
PrefHashFilter* raw_unprotected_pref_hash_filter =
unprotected_pref_hash_filter.get();
--
2.25.1
Reference in New Issue View Git Blame Copy Permalink