From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Tue, 16 Oct 2018 05:22:59 +0200 Subject: Disable safe browsing Originally based on ungoogled-chromium patch Contains Android-specific fixes to remove Safe Browsing Disable CrowdDeny feature Remove phishing classifier License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../res/xml/google_services_preferences.xml | 5 - .../android/java/res/xml/main_preferences.xml | 5 - .../java/res/xml/privacy_preferences.xml | 9 -- .../privacy/settings/PrivacySettings.java | 48 +--------- .../SafeBrowsingSettingsLauncher.java | 8 -- .../usage_stats/UsageStatsConsentDialog.java | 5 - .../android/chrome_main_delegate_android.cc | 1 + chrome/browser/BUILD.gn | 26 ------ .../tab_web_contents_delegate_android.cc | 8 ++ chrome/browser/browser_process.h | 7 -- chrome/browser/browser_process_impl.cc | 29 ------ chrome/browser/browser_process_impl.h | 4 - .../chrome_browsing_data_remover_delegate.cc | 2 + .../browser/chrome_content_browser_client.cc | 24 +++-- .../browser/chrome_content_browser_client.h | 2 + .../file_type_policies_component_installer.cc | 16 +--- .../browser/component_updater/registration.cc | 12 --- .../chrome_download_manager_delegate.cc | 48 ++++------ .../chrome_download_manager_delegate.h | 2 +- .../browser/download/download_item_model.cc | 15 ++- chrome/browser/download/download_item_model.h | 4 + chrome/browser/download/download_prefs.cc | 17 +--- chrome/browser/download/download_stats.cc | 6 ++ .../download/download_target_determiner.cc | 66 +++++--------- .../download/download_target_determiner.h | 6 ++ .../browser/download/download_target_info.cc | 4 + .../browser/download/download_target_info.h | 4 + chrome/browser/download/download_ui_model.cc | 4 + chrome/browser/download/download_ui_model.h | 4 + .../extensions/api/downloads/downloads_api.cc | 41 +-------- .../extensions/api/downloads/downloads_api.h | 12 --- .../webstore_private/webstore_private_api.cc | 18 +--- ...e_file_system_access_permission_context.cc | 16 +++- ...me_file_system_access_permission_context.h | 5 +- .../lookalike_url_controller_client.cc | 3 - .../metrics/chrome_metrics_service_client.cc | 1 - ...ial_comparison_cert_verifier_controller.cc | 3 - .../chrome_password_manager_client.cc | 28 +----- .../permissions/chrome_permissions_client.cc | 14 --- .../permissions/chrome_permissions_client.h | 3 - .../permission_revocation_request.cc | 6 ++ ...quiet_notification_permission_ui_config.cc | 4 +- chrome/browser/prefs/browser_prefs.cc | 3 + chrome/browser/privacy_guide/android/BUILD.gn | 2 - .../privacy_guide/PrivacyGuideFragment.java | 3 - .../PrivacyGuidePagerAdapter.java | 2 - .../privacy_guide/PrivacyGuideUtils.java | 6 +- .../privacy_guide/StepDisplayHandlerImpl.java | 2 +- ...hrome_browser_main_extra_parts_profiles.cc | 10 +- chrome/browser/profiles/profile_impl.cc | 4 +- chrome/browser/safe_browsing/BUILD.gn | 4 +- chrome/browser/safe_browsing/android/BUILD.gn | 5 - .../safe_browsing/SafeBrowsingBridge.java | 91 ------------------- .../android/safe_browsing_bridge.cc | 59 ------------ .../download_protection_service.cc | 2 + .../download_protection_service.h | 3 +- .../url_lookup_service_factory.cc | 4 + .../ssl/generated_https_first_mode_pref.cc | 26 +----- .../ssl/generated_https_first_mode_pref.h | 12 +-- .../ssl/https_first_mode_settings_tracker.cc | 16 ---- .../ssl/https_first_mode_settings_tracker.h | 10 +- .../ssl/sct_reporting_service_factory.cc | 11 +-- .../browser/ssl/security_state_tab_helper.cc | 9 +- ...urce_filter_web_contents_helper_factory.cc | 4 + chrome/browser/ui/BUILD.gn | 2 - .../strings/android_chrome_strings.grd | 6 -- chrome/browser/ui/tab_helpers.cc | 7 +- .../ui/webui/interstitials/interstitial_ui.cc | 16 +--- chrome/common/safe_browsing/BUILD.gn | 7 -- chrome/renderer/BUILD.gn | 5 - .../chrome_content_renderer_client.cc | 6 +- .../renderer/chrome_content_renderer_client.h | 3 - chrome/test/BUILD.gn | 5 - components/BUILD.gn | 1 - .../installer_policies/BUILD.gn | 2 - .../permissions/permission_request_manager.cc | 5 +- .../safe_browsing/content/browser/BUILD.gn | 1 - .../content/common/file_type_policies.cc | 3 +- .../safe_browsing/core/common/features.cc | 4 +- .../content/captive_portal_blocking_page.cc | 9 +- .../content/cert_report_helper.cc | 5 +- .../unified_consent_service.cc | 2 +- .../file_system_access_file_writer_impl.cc | 3 +- .../file_system_access_file_writer_impl.h | 5 - .../file_system_access_safe_move_helper.cc | 15 +-- .../file_system_access_safe_move_helper.h | 6 -- .../file_system_access_permission_context.h | 6 -- weblayer/BUILD.gn | 4 - weblayer/test/BUILD.gn | 1 - 89 files changed, 213 insertions(+), 749 deletions(-) diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml --- a/chrome/android/java/res/xml/google_services_preferences.xml +++ b/chrome/android/java/res/xml/google_services_preferences.xml @@ -21,11 +21,6 @@ found in the LICENSE file. android:key="metrics_settings" android:title="@string/manage_metrics_settings" android:fragment="org.chromium.chrome.browser.metrics_settings.MetricsSettingsFragment"/> - - - - { - preference.getExtras().putInt( - SafeBrowsingSettingsFragment.ACCESS_POINT, SettingsAccessPoint.PARENT_SETTINGS); - return false; - }); - setHasOptionsMenu(true); ChromeSwitchPreference canMakePaymentPref = @@ -148,16 +133,11 @@ public class PrivacySettings public boolean isPreferenceClickDisabledByPolicy(Preference preference) { // Advanced Protection automatically enables HTTPS-Only Mode so // lock the setting. - return isPreferenceControlledByPolicy(preference) - || SafeBrowsingBridge.isUnderAdvancedProtection(); + return isPreferenceControlledByPolicy(preference); } }); httpsFirstModePref.setChecked(UserPrefs.get(Profile.getLastUsedRegularProfile()) .getBoolean(Pref.HTTPS_ONLY_MODE_ENABLED)); - if (SafeBrowsingBridge.isUnderAdvancedProtection()) { - httpsFirstModePref.setSummary(getContext().getResources().getString( - R.string.settings_https_first_mode_with_advanced_protection_summary)); - } Preference secureDnsPref = findPreference(PREF_SECURE_DNS); secureDnsPref.setVisible(SecureDnsSettings.isUiEnabled()); @@ -249,32 +229,6 @@ public class PrivacySettings secureDnsPref.setSummary(SecureDnsSettings.getSummary(getContext())); } - Preference safeBrowsingPreference = findPreference(PREF_SAFE_BROWSING); - if (safeBrowsingPreference != null && safeBrowsingPreference.isVisible()) { - safeBrowsingPreference.setSummary( - SafeBrowsingSettingsFragment.getSafeBrowsingSummaryString(getContext())); - } - - Preference usageStatsPref = findPreference(PREF_USAGE_STATS); - if (usageStatsPref != null) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q - && prefService.getBoolean(Pref.USAGE_STATS_ENABLED)) { - usageStatsPref.setOnPreferenceClickListener(preference -> { - UsageStatsConsentDialog - .create(getActivity(), true, - (didConfirm) -> { - if (didConfirm) { - updatePreferences(); - } - }) - .show(); - return true; - }); - } else { - getPreferenceScreen().removePreference(usageStatsPref); - } - } - Preference privacySandboxPreference = findPreference(PREF_PRIVACY_SANDBOX); if (privacySandboxPreference != null && !ChromeFeatureList.isEnabled(ChromeFeatureList.PRIVACY_SANDBOX_SETTINGS_4)) { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java --- a/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java @@ -7,11 +7,9 @@ import android.content.Context; import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.safe_browsing.metrics.SettingsAccessPoint; -import org.chromium.chrome.browser.safe_browsing.settings.SafeBrowsingSettingsFragment; import org.chromium.chrome.browser.settings.SettingsLauncherImpl; import org.chromium.components.browser_ui.settings.SettingsLauncher; import org.chromium.content_public.browser.WebContents; -import org.chromium.ui.base.WindowAndroid; /** * Bridge between Java and native SafeBrowsing code to launch the Safe Browsing settings page. @@ -22,11 +20,5 @@ public class SafeBrowsingSettingsLauncher { @CalledByNative private static void showSafeBrowsingSettings( WebContents webContents, @SettingsAccessPoint int accessPoint) { - WindowAndroid window = webContents.getTopLevelNativeWindow(); - if (window == null) return; - Context currentContext = window.getContext().get(); - SettingsLauncher settingsLauncher = new SettingsLauncherImpl(); - settingsLauncher.launchSettingsActivity(currentContext, SafeBrowsingSettingsFragment.class, - SafeBrowsingSettingsFragment.createArguments(accessPoint)); } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/usage_stats/UsageStatsConsentDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/usage_stats/UsageStatsConsentDialog.java --- a/chrome/android/java/src/org/chromium/chrome/browser/usage_stats/UsageStatsConsentDialog.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/usage_stats/UsageStatsConsentDialog.java @@ -48,11 +48,6 @@ public class UsageStatsConsentDialog { .with(ModalDialogProperties.MESSAGE_PARAGRAPH_1, resources.getString(R.string.usage_stats_revocation_explanation)) .with(ModalDialogProperties.POSITIVE_BUTTON_TEXT, resources, R.string.remove); - } else { - builder.with(ModalDialogProperties.TITLE, resources, R.string.usage_stats_consent_title) - .with(ModalDialogProperties.MESSAGE_PARAGRAPH_1, - resources.getString(R.string.usage_stats_consent_prompt)) - .with(ModalDialogProperties.POSITIVE_BUTTON_TEXT, resources, R.string.show); } mDialogModel = builder.build(); diff --git a/chrome/app/android/chrome_main_delegate_android.cc b/chrome/app/android/chrome_main_delegate_android.cc --- a/chrome/app/android/chrome_main_delegate_android.cc +++ b/chrome/app/android/chrome_main_delegate_android.cc @@ -9,6 +9,7 @@ #include "base/android/jni_android.h" #include "base/base_paths_android.h" #include "base/feature_list.h" +#include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/logging.h" diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -299,8 +299,6 @@ static_library("browser") { "commerce/shopping_service_factory.h", "complex_tasks/task_tab_helper.cc", "complex_tasks/task_tab_helper.h", - "component_updater/chrome_client_side_phishing_component_installer.cc", - "component_updater/chrome_client_side_phishing_component_installer.h", "component_updater/chrome_component_updater_configurator.cc", "component_updater/chrome_component_updater_configurator.h", "component_updater/chrome_origin_trials_component_installer.cc", @@ -313,8 +311,6 @@ static_library("browser") { "component_updater/component_updater_utils.h", "component_updater/crl_set_component_installer.cc", "component_updater/crl_set_component_installer.h", - "component_updater/crowd_deny_component_installer.cc", - "component_updater/crowd_deny_component_installer.h", "component_updater/desktop_sharing_hub_component_remover.cc", "component_updater/desktop_sharing_hub_component_remover.h", "component_updater/first_party_sets_component_installer.cc", @@ -665,11 +661,6 @@ static_library("browser") { "lookalikes/lookalike_url_service.h", "lookalikes/lookalike_url_tab_storage.cc", "lookalikes/lookalike_url_tab_storage.h", - "lookalikes/safety_tip_ui.h", - "lookalikes/safety_tip_ui_helper.cc", - "lookalikes/safety_tip_ui_helper.h", - "lookalikes/safety_tip_web_contents_observer.cc", - "lookalikes/safety_tip_web_contents_observer.h", "media/audio_service_util.cc", "media/audio_service_util.h", "media/history/media_history_contents_observer.cc", @@ -1102,8 +1093,6 @@ static_library("browser") { "permissions/adaptive_quiet_notification_permission_ui_enabler.h", "permissions/chrome_permissions_client.cc", "permissions/chrome_permissions_client.h", - "permissions/contextual_notification_permission_ui_selector.cc", - "permissions/contextual_notification_permission_ui_selector.h", "permissions/crowd_deny_preload_data.cc", "permissions/crowd_deny_preload_data.h", "permissions/crowd_deny_safe_browsing_request.cc", @@ -2172,9 +2161,6 @@ static_library("browser") { "//components/leveldb_proto", "//components/live_caption:constants", "//components/live_caption:utils", - "//components/lookalikes/core", - "//components/lookalikes/core:proto", - "//components/lookalikes/core:safety_tips", "//components/memory_pressure", "//components/metrics:call_stack_profile_collector", "//components/metrics:call_stack_profile_params", @@ -2269,7 +2255,6 @@ static_library("browser") { "//components/reporting/util:task_runner_context", "//components/resources", "//components/safe_browsing/content/browser", - "//components/safe_browsing/content/browser:client_side_detection", "//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", @@ -3073,12 +3058,6 @@ static_library("browser") { "lifetime/application_lifetime_android.h", "long_screenshots/long_screenshots_tab_service_factory.cc", "long_screenshots/long_screenshots_tab_service_factory.h", - "lookalikes/safety_tip_infobar_android.cc", - "lookalikes/safety_tip_infobar_android.h", - "lookalikes/safety_tip_infobar_delegate_android.cc", - "lookalikes/safety_tip_infobar_delegate_android.h", - "lookalikes/safety_tip_message_delegate_android.cc", - "lookalikes/safety_tip_message_delegate_android.h", "media/android/cdm/media_drm_origin_id_manager.cc", "media/android/cdm/media_drm_origin_id_manager.h", "media/android/cdm/media_drm_origin_id_manager_factory.cc", @@ -3630,8 +3609,6 @@ static_library("browser") { "download/download_commands.h", "download/download_crx_util.cc", "download/download_crx_util.h", - "download/download_danger_prompt.cc", - "download/download_danger_prompt.h", "download/download_dir_policy_handler.cc", "download/download_dir_policy_handler.h", "download/download_dir_util.cc", @@ -7943,9 +7920,6 @@ static_library("test_support") { "//components/consent_auditor:test_support", "//components/invalidation/impl", "//components/invalidation/impl:test_support", - "//components/lookalikes/core", - "//components/lookalikes/core:proto", - "//components/lookalikes/core:safety_tips", "//components/password_manager/core/browser:test_support", "//components/policy/core/browser:test_support", "//components/prefs:test_support", diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrome/browser/android/tab_web_contents_delegate_android.cc --- a/chrome/browser/android/tab_web_contents_delegate_android.cc +++ b/chrome/browser/android/tab_web_contents_delegate_android.cc @@ -35,7 +35,9 @@ #include "chrome/browser/prefetch/prefetch_prefs.h" #include "chrome/browser/preloading/prefetch/no_state_prefetch/no_state_prefetch_manager_factory.h" #include "chrome/browser/profiles/profile.h" +#if BUILDFLAG(FULL_SAFE_BROWSING) #include "chrome/browser/safe_browsing/safe_browsing_navigation_observer_manager_factory.h" +#endif #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/ui/android/tab_model/tab_model_list.h" #include "chrome/browser/ui/autofill/chrome_autofill_client.h" @@ -60,7 +62,9 @@ #include "components/navigation_interception/intercept_navigation_delegate.h" #include "components/no_state_prefetch/browser/no_state_prefetch_manager.h" #include "components/paint_preview/buildflags/buildflags.h" +#if BUILDFLAG(FULL_SAFE_BROWSING) #include "components/safe_browsing/content/browser/safe_browsing_navigation_observer.h" +#endif #include "content/public/browser/file_select_listener.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/render_frame_host.h" @@ -145,8 +149,10 @@ void TabWebContentsDelegateAndroid::PortalWebContentsCreated( content::WebContents* portal_contents) { WebContentsDelegateAndroid::PortalWebContentsCreated(portal_contents); +#if BUILDFLAG(FULL_SAFE_BROWSING) Profile* profile = Profile::FromBrowserContext(portal_contents->GetBrowserContext()); +#endif // This is a subset of the tab helpers that would be attached by // TabAndroid::AttachTabHelpers. @@ -169,11 +175,13 @@ void TabWebContentsDelegateAndroid::PortalWebContentsCreated( HistoryTabHelper::CreateForWebContents(portal_contents); infobars::ContentInfoBarManager::CreateForWebContents(portal_contents); PrefsTabHelper::CreateForWebContents(portal_contents); +#if BUILDFLAG(FULL_SAFE_BROWSING) safe_browsing::SafeBrowsingNavigationObserver::MaybeCreateForWebContents( portal_contents, HostContentSettingsMapFactory::GetForProfile(profile), safe_browsing::SafeBrowsingNavigationObserverManagerFactory:: GetForBrowserContext(profile), profile->GetPrefs(), g_browser_process->safe_browsing_service()); +#endif } void TabWebContentsDelegateAndroid::RunFileChooser( diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h --- a/chrome/browser/browser_process.h +++ b/chrome/browser/browser_process.h @@ -55,10 +55,6 @@ class NetworkQualityTracker; class SharedURLLoaderFactory; } -namespace safe_browsing { -class SafeBrowsingService; -} - namespace subresource_filter { class RulesetService; } @@ -211,9 +207,6 @@ class BrowserProcess { // on this platform (or this is a unit test). virtual StatusTray* status_tray() = 0; - // Returns the SafeBrowsing service. - virtual safe_browsing::SafeBrowsingService* safe_browsing_service() = 0; - // Returns the service providing versioned storage for rules used by the Safe // Browsing subresource filter. virtual subresource_filter::RulesetService* diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -72,7 +72,6 @@ #include "chrome/browser/printing/print_preview_dialog_controller.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/resource_coordinator/resource_coordinator_parts.h" -#include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/site_isolation/prefs_observer.h" #include "chrome/browser/ssl/secure_origin_prefs_observer.h" @@ -111,7 +110,6 @@ #include "components/prefs/json_pref_store.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" -#include "components/safe_browsing/content/browser/safe_browsing_service_interface.h" #include "components/sessions/core/session_id_generator.h" #include "components/subresource_filter/content/browser/ruleset_service.h" #include "components/translate/core/browser/translate_download_manager.h" @@ -418,8 +416,6 @@ void BrowserProcessImpl::StartTearDown() { metrics_services_manager_.reset(); intranet_redirect_detector_.reset(); - if (safe_browsing_service_.get()) - safe_browsing_service()->ShutDown(); network_time_tracker_.reset(); #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) @@ -1062,14 +1058,6 @@ StatusTray* BrowserProcessImpl::status_tray() { return status_tray_.get(); } -safe_browsing::SafeBrowsingService* -BrowserProcessImpl::safe_browsing_service() { - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (!created_safe_browsing_service_) - CreateSafeBrowsingService(); - return safe_browsing_service_.get(); -} - subresource_filter::RulesetService* BrowserProcessImpl::subresource_filter_ruleset_service() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -1309,23 +1297,6 @@ void BrowserProcessImpl::CreateBackgroundPrintingManager() { } void BrowserProcessImpl::CreateSafeBrowsingService() { - DCHECK(!safe_browsing_service_); - // Set this flag to true so that we don't retry indefinitely to - // create the service class if there was an error. - created_safe_browsing_service_ = true; - - // The factory can be overridden in tests. - if (!safe_browsing::SafeBrowsingServiceInterface::HasFactory()) { - safe_browsing::SafeBrowsingServiceInterface::RegisterFactory( - safe_browsing::GetSafeBrowsingServiceFactory()); - } - - // TODO(crbug/925153): Port consumers of the |safe_browsing_service_| to use - // the interface in components/safe_browsing, and remove this cast. - safe_browsing_service_ = static_cast( - safe_browsing::SafeBrowsingServiceInterface::CreateSafeBrowsingService()); - if (safe_browsing_service_) - safe_browsing_service_->Initialize(); } void BrowserProcessImpl::CreateSubresourceFilterRulesetService() { diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h @@ -180,7 +180,6 @@ class BrowserProcessImpl : public BrowserProcess, std::unique_ptr manager) override; #endif StatusTray* status_tray() override; - safe_browsing::SafeBrowsingService* safe_browsing_service() override; subresource_filter::RulesetService* subresource_filter_ruleset_service() override; @@ -331,9 +330,6 @@ class BrowserProcessImpl : public BrowserProcess, std::unique_ptr background_mode_manager_; #endif - bool created_safe_browsing_service_ = false; - scoped_refptr safe_browsing_service_; - bool created_subresource_filter_ruleset_service_ = false; std::unique_ptr subresource_filter_ruleset_service_; 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 @@ -634,10 +634,12 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies")); network::mojom::NetworkContext* safe_browsing_context = nullptr; +#if BUILDFLAG(FULL_SAFE_BROWSING) safe_browsing::SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service(); if (sb_service) safe_browsing_context = sb_service->GetNetworkContext(profile_); +#endif // Cleared for DATA_TYPE_HISTORY, DATA_TYPE_COOKIES and DATA_TYPE_PASSWORDS. browsing_data::RemoveFederatedSiteSettingsData(delete_begin_, delete_end_, diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -121,6 +121,7 @@ #include "chrome/browser/profiling_host/chrome_browser_main_extra_parts_profiling.h" #include "chrome/browser/renderer_host/chrome_navigation_ui_data.h" #include "chrome/browser/renderer_preferences_util.h" +#if defined(FULL_SAFE_BROWSING) #include "chrome/browser/safe_browsing/certificate_reporting_service.h" #include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h" @@ -128,6 +129,7 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/safe_browsing/url_checker_delegate_impl.h" #include "chrome/browser/safe_browsing/url_lookup_service_factory.h" +#endif #include "chrome/browser/search/search.h" #include "chrome/browser/segmentation_platform/chrome_browser_main_extra_parts_segmentation_platform.h" #include "chrome/browser/sharing/sms/sms_remote_fetcher.h" @@ -1065,9 +1067,7 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) { class CertificateReportingServiceCertReporter : public SSLCertReporter { public: explicit CertificateReportingServiceCertReporter( - content::WebContents* web_contents) - : service_(CertificateReportingServiceFactory::GetForBrowserContext( - web_contents->GetBrowserContext())) {} + content::WebContents* web_contents) {} CertificateReportingServiceCertReporter( const CertificateReportingServiceCertReporter&) = delete; @@ -1079,11 +1079,9 @@ class CertificateReportingServiceCertReporter : public SSLCertReporter { // SSLCertReporter implementation void ReportInvalidCertificateChain( const std::string& serialized_report) override { - service_->Send(serialized_report); } private: - raw_ptr service_; }; #if BUILDFLAG(ENABLE_EXTENSIONS) @@ -2575,7 +2573,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( } #elif BUILDFLAG(IS_POSIX) #if BUILDFLAG(IS_ANDROID) - bool enable_crash_reporter = true; + bool enable_crash_reporter = false; #elif BUILDFLAG(IS_CHROMEOS) bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { @@ -5027,6 +5025,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( &throttles); #endif +#if defined(FULL_SAFE_BROWSING) // g_browser_process->safe_browsing_service() may be null in unittests. safe_browsing::SafeBrowsingUIManager* ui_manager = g_browser_process->safe_browsing_service() @@ -5042,6 +5041,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( std::make_unique( handle)); } +#endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: @@ -5312,7 +5312,9 @@ void ChromeContentBrowserClient::OverridePageVisibilityState( void ChromeContentBrowserClient::InitOnUIThread() { DCHECK_CURRENTLY_ON(BrowserThread::UI); +#if defined(FULL_SAFE_BROWSING) safe_browsing_service_ = g_browser_process->safe_browsing_service(); +#endif // Initialize `network_contexts_parent_directory_`. base::FilePath user_data_dir; @@ -6585,6 +6587,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate( const std::vector& allowlist_domains) { DCHECK_CURRENTLY_ON(BrowserThread::IO); +#if defined(FULL_SAFE_BROWSING) // Should not bypass safe browsing check if the check is for enterprise // lookup. if (!safe_browsing_enabled_for_profile && !should_check_on_sb_disabled) @@ -6605,6 +6608,9 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate( } return safe_browsing_url_checker_delegate_; +#else + return nullptr; +#endif } safe_browsing::RealTimeUrlLookupServiceBase* @@ -6612,24 +6618,28 @@ ChromeContentBrowserClient::GetUrlLookupService( content::BrowserContext* browser_context, bool is_enterprise_lookup_enabled, bool is_consumer_lookup_enabled) { +#if defined(FULL_SAFE_BROWSING) // |safe_browsing_service_| may be unavailable in tests. if (!safe_browsing_service_) { return nullptr; } +#endif +#if BUILDFLAG(SAFE_BROWSING_DB_LOCAL) Profile* profile = Profile::FromBrowserContext(browser_context); -#if BUILDFLAG(SAFE_BROWSING_DB_LOCAL) if (is_enterprise_lookup_enabled) { return safe_browsing::ChromeEnterpriseRealTimeUrlLookupServiceFactory:: GetForProfile(profile); } #endif +#if defined(FULL_SAFE_BROWSING) if (is_consumer_lookup_enabled) { return safe_browsing::RealTimeUrlLookupServiceFactory::GetForProfile( profile); } +#endif return nullptr; } diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h @@ -941,9 +941,11 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { // Parts are deleted in the reverse order they are added. std::vector extra_parts_; +#if defined(FULL_SAFE_BROWSING) scoped_refptr safe_browsing_service_; scoped_refptr safe_browsing_url_checker_delegate_; +#endif StartupData startup_data_; diff --git a/chrome/browser/component_updater/file_type_policies_component_installer.cc b/chrome/browser/component_updater/file_type_policies_component_installer.cc --- a/chrome/browser/component_updater/file_type_policies_component_installer.cc +++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc @@ -19,7 +19,9 @@ #include "base/task/thread_pool.h" #include "base/version.h" #include "components/component_updater/component_updater_paths.h" +#if defined(FULL_SAFE_BROWSING) #include "components/safe_browsing/content/common/file_type_policies.h" +#endif #include "components/safe_browsing/core/common/features.h" using component_updater::ComponentUpdateService; @@ -39,20 +41,6 @@ const uint8_t kFileTypePoliciesPublicKeySHA256[32] = { const char kFileTypePoliciesManifestName[] = "File Type Policies"; void LoadFileTypesFromDisk(const base::FilePath& pb_path) { - if (pb_path.empty()) - return; - - VLOG(1) << "Reading Download File Types from file: " << pb_path.value(); - std::string binary_pb; - if (!base::ReadFileToString(pb_path, &binary_pb)) { - // The file won't exist on new installations, so this is not always an - // error. - VLOG(1) << "Failed reading from " << pb_path.value(); - return; - } - - safe_browsing::FileTypePolicies::GetInstance()->PopulateFromDynamicUpdate( - binary_pb); } } // namespace diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/component_updater/registration.cc --- a/chrome/browser/component_updater/registration.cc +++ b/chrome/browser/component_updater/registration.cc @@ -18,7 +18,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/buildflags.h" #include "chrome/browser/component_updater/app_provisioning_component_installer.h" -#include "chrome/browser/component_updater/chrome_client_side_phishing_component_installer.h" #include "chrome/browser/component_updater/chrome_origin_trials_component_installer.h" #include "chrome/browser/component_updater/commerce_heuristics_component_installer.h" #include "chrome/browser/component_updater/crl_set_component_installer.h" @@ -39,7 +38,6 @@ #include "components/component_updater/installer_policies/autofill_states_component_installer.h" #include "components/component_updater/installer_policies/on_device_head_suggest_component_installer.h" #include "components/component_updater/installer_policies/optimization_hints_component_installer.h" -#include "components/component_updater/installer_policies/safety_tips_component_installer.h" #include "components/component_updater/url_param_filter_remover.h" #include "components/nacl/common/buildflags.h" #include "components/safe_browsing/core/common/features.h" @@ -185,9 +183,6 @@ void RegisterComponentsForUpdate() { MaybeRegisterPKIMetadataComponent(cus); - RegisterSafetyTipsComponent(cus); - RegisterCrowdDenyComponent(cus); - #if BUILDFLAG(IS_CHROMEOS_ASH) RegisterSmartDimComponent(cus); RegisterAppProvisioningComponent(cus); @@ -208,13 +203,6 @@ void RegisterComponentsForUpdate() { RegisterAutofillStatesComponent(cus, g_browser_process->local_state()); - // OptimizationGuide provides the model through their services, so if the - // flag is false, a registration to CSD-Phishing component is needed - if (!base::FeatureList::IsEnabled( - safe_browsing::kClientSideDetectionModelOptimizationGuide)) { - RegisterClientSidePhishingComponent(cus); - } - #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && !BUILDFLAG(IS_CHROMEOS) RegisterScreenAIComponent(cus, g_browser_process->local_state()); #endif // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && !BUILDFLAG(IS_CHROMEOS) 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 @@ -43,15 +43,19 @@ #include "chrome/browser/download/insecure_download_blocking.h" #include "chrome/browser/download/save_package_file_picker.h" #include "chrome/browser/enterprise/connectors/common.h" +#if defined(FULL_SAFE_BROWSING) #include "chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.h" #include "chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_factory.h" +#endif #include "chrome/browser/platform_util.h" #include "chrome/browser/profiles/profile.h" +#if defined(FULL_SAFE_BROWSING) #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" #include "chrome/common/buildflags.h" #include "chrome/common/chrome_constants.h" +#endif #include "chrome/common/chrome_features.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/net/safe_search_util.h" @@ -68,9 +72,11 @@ #include "components/prefs/pref_member.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/buildflags.h" +#if defined(FULL_SAFE_BROWSING) #include "components/safe_browsing/content/browser/download/download_stats.h" #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" #include "components/safe_browsing/content/common/file_type_policies.h" +#endif #include "components/services/quarantine/public/mojom/quarantine.mojom.h" #include "components/services/quarantine/quarantine_impl.h" #include "content/public/browser/browser_task_traits.h" @@ -136,7 +142,9 @@ using content::DownloadManager; using download::DownloadItem; using download::DownloadPathReservationTracker; using download::PathValidationResult; +#if defined(FULL_SAFE_BROWSING) using safe_browsing::DownloadFileType; +#endif using ConnectionType = net::NetworkChangeNotifier::ConnectionType; #if BUILDFLAG(FULL_SAFE_BROWSING) @@ -360,12 +368,12 @@ void HandleInsecureDownloadInfoBarResult( } #endif +#if BUILDFLAG(FULL_SAFE_BROWSING) void MaybeReportDangerousDownloadBlocked( DownloadPrefs::DownloadRestriction download_restriction, std::string danger_type, std::string download_path, download::DownloadItem* download) { -#if BUILDFLAG(FULL_SAFE_BROWSING) if (download_restriction != DownloadPrefs::DownloadRestriction::POTENTIALLY_DANGEROUS_FILES && download_restriction != @@ -402,8 +410,8 @@ void MaybeReportDangerousDownloadBlocked( danger_type, download->GetMimeType(), /*scan_id*/ "", download->GetTotalBytes(), safe_browsing::EventResult::BLOCKED); } -#endif } +#endif #if BUILDFLAG(FULL_SAFE_BROWSING) download::DownloadDangerType SavePackageDangerType( @@ -461,13 +469,6 @@ void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) { download_manager_ = dm; - safe_browsing::SafeBrowsingService* sb_service = - g_browser_process->safe_browsing_service(); - if (sb_service && !profile_->IsOffTheRecord()) { - // Include this download manager in the set monitored by safe browsing. - sb_service->AddDownloadManager(dm); - } - if (download_manager_) { download_manager_->AddObserver(this); } @@ -832,17 +833,6 @@ void ChromeDownloadManagerDelegate::ChooseSavePath( void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName( base::FilePath* filename, const GURL& source_url) { - safe_browsing::FileTypePolicies* file_type_policies = - safe_browsing::FileTypePolicies::GetInstance(); - - const PrefService* prefs = profile_->GetPrefs(); - if (file_type_policies->GetFileDangerLevel(*filename, source_url, prefs) == - safe_browsing::DownloadFileType::NOT_DANGEROUS) - return; - - base::FilePath default_filename = base::FilePath::FromUTF8Unsafe( - l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME)); - *filename = filename->AddExtension(default_filename.BaseName().value()); } void ChromeDownloadManagerDelegate::SanitizeDownloadParameters( @@ -906,9 +896,6 @@ void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) { chrome::ShowSettingsSubPage(browser, "certificates"); else browser->OpenURL(params); - - RecordDownloadOpen(DOWNLOAD_OPEN_METHOD_DEFAULT_BROWSER, - download->GetMimeType()); #endif // BUILDFLAG(IS_ANDROID) } @@ -962,12 +949,6 @@ ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() { DownloadProtectionService* ChromeDownloadManagerDelegate::GetDownloadProtectionService() { DCHECK_CURRENTLY_ON(BrowserThread::UI); - safe_browsing::SafeBrowsingService* sb_service = - g_browser_process->safe_browsing_service(); - if (sb_service && sb_service->download_protection_service()) { - return sb_service->download_protection_service(); - } - return nullptr; } #endif @@ -1514,8 +1495,11 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined( DownloadItemModel model(item); model.DetermineAndSetShouldPreferOpeningInBrowser( target_info->target_path, target_info->is_filetype_handled_safely); +#if BUILDFLAG(FULL_SAFE_BROWSING) model.SetDangerLevel(target_info->danger_level); +#endif } +#if BUILDFLAG(FULL_SAFE_BROWSING) if (ShouldBlockFile(item, target_info->danger_type)) { MaybeReportDangerousDownloadBlocked( download_prefs_->download_restriction(), "DANGEROUS_FILE_TYPE", @@ -1524,6 +1508,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined( // A dangerous type would take precedence over the blocking of the file. target_info->danger_type = download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS; } +#endif base::FilePath target_path = target_info->target_path; @@ -1593,6 +1578,7 @@ bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( bool ChromeDownloadManagerDelegate::ShouldBlockFile( download::DownloadItem* item, download::DownloadDangerType danger_type) const { +#if BUILDFLAG(FULL_SAFE_BROWSING) DownloadPrefs::DownloadRestriction download_restriction = download_prefs_->download_restriction(); @@ -1641,7 +1627,7 @@ bool ChromeDownloadManagerDelegate::ShouldBlockFile( LOG(ERROR) << "Invalid download restruction value: " << static_cast(download_restriction); } - +#endif return false; } @@ -1655,7 +1641,6 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport( service->MaybeSendDangerousDownloadOpenedReport(download, show_download_in_folder); } -#endif if (!download->GetAutoOpened()) { download::DownloadContent download_content = download::DownloadContentFromMimeType(download->GetMimeType(), false); @@ -1663,6 +1648,7 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport( download->GetDangerType(), download_content, base::Time::Now(), download->GetEndTime(), show_download_in_folder); } +#endif } void ChromeDownloadManagerDelegate::CheckDownloadAllowed( diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome/browser/download/chrome_download_manager_delegate.h --- a/chrome/browser/download/chrome_download_manager_delegate.h +++ b/chrome/browser/download/chrome_download_manager_delegate.h @@ -154,7 +154,7 @@ class ChromeDownloadManagerDelegate DownloadPrefs* download_prefs() { return download_prefs_.get(); } -#if BUILDFLAG(FULL_SAFE_BROWSING) +#if defined(FULL_SAFE_BROWSING) // The state of a safebrowsing check. class SafeBrowsingState : public DownloadCompletionBlocker { public: 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 @@ -33,7 +33,9 @@ #include "chrome/browser/download/offline_item_utils.h" #include "chrome/browser/enterprise/connectors/common.h" #include "chrome/browser/enterprise/connectors/connectors_manager.h" +#if BUILDFLAG(FULL_SAFE_BROWSING) #include "chrome/browser/profiles/profile.h" +#endif #include "chrome/browser/safe_browsing/download_protection/download_protection_util.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/signin/identity_manager_factory.h" @@ -44,8 +46,10 @@ #include "components/download/public/common/download_item.h" #include "components/safe_browsing/buildflags.h" #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" +#if BUILDFLAG(FULL_SAFE_BROWSING) #include "components/safe_browsing/content/common/file_type_policies.h" #include "components/safe_browsing/content/common/proto/download_file_types.pb.h" +#endif #include "components/safe_browsing/core/common/features.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/identity_manager/account_info.h" @@ -70,7 +74,9 @@ using download::DownloadItem; using InsecureDownloadStatus = download::DownloadItem::InsecureDownloadStatus; +#if defined(FULL_SAFE_BROWSING) using safe_browsing::DownloadFileType; +#endif using ReportThreatDetailsResult = safe_browsing::PingManager::ReportThreatDetailsResult; using TailoredVerdict = safe_browsing::ClientDownloadResponse::TailoredVerdict; @@ -108,9 +114,11 @@ class DownloadItemModelData : public base::SupportsUserData::Data { // for the file type. absl::optional should_prefer_opening_in_browser_; +#if defined(FULL_SAFE_BROWSING) // Danger level of the file determined based on the file type and whether // there was a user action associated with the download. DownloadFileType::DangerLevel danger_level_; +#endif // Whether the download is currently being revived. bool is_being_revived_; @@ -160,7 +168,9 @@ DownloadItemModelData* DownloadItemModelData::GetOrCreate( DownloadItemModelData::DownloadItemModelData() : should_show_in_shelf_(true), was_ui_notified_(false), +#if defined(FULL_SAFE_BROWSING) danger_level_(DownloadFileType::NOT_DANGEROUS), +#endif is_being_revived_(false) {} #if BUILDFLAG(FULL_SAFE_BROWSING) @@ -543,6 +553,7 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) { data->should_prefer_opening_in_browser_ = preference; } +#if defined(FULL_SAFE_BROWSING) DownloadFileType::DangerLevel DownloadItemModel::GetDangerLevel() const { const DownloadItemModelData* data = DownloadItemModelData::Get(download_); return data ? data->danger_level_ : DownloadFileType::NOT_DANGEROUS; @@ -553,6 +564,7 @@ void DownloadItemModel::SetDangerLevel( DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_); data->danger_level_ = danger_level; } +#endif download::DownloadItem::InsecureDownloadStatus DownloadItemModel::GetInsecureDownloadStatus() const { @@ -728,9 +740,6 @@ bool DownloadItemModel::IsCommandEnabled( // filename. Don't base an "Always open" decision based on it. Also // exclude extensions. return download_->CanOpenDownload() && - safe_browsing::FileTypePolicies::GetInstance() - ->IsAllowedToOpenAutomatically( - download_->GetTargetFilePath()) && !download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::PAUSE: return !download_->IsSavePackageDownload() && diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/download/download_item_model.h --- a/chrome/browser/download/download_item_model.h +++ b/chrome/browser/download/download_item_model.h @@ -14,7 +14,9 @@ #include "chrome/browser/download/download_ui_model.h" #include "components/download/public/common/download_item.h" #include "components/safe_browsing/buildflags.h" +#if defined(FULL_SAFE_BROWSING) #include "components/safe_browsing/content/common/proto/download_file_types.pb.h" +#endif namespace content { class WebContents; @@ -72,9 +74,11 @@ class DownloadItemModel : public DownloadUIModel, void SetEphemeralWarningUiShownTime(absl::optional time) override; bool ShouldPreferOpeningInBrowser() override; void SetShouldPreferOpeningInBrowser(bool preference) override; +#if defined(FULL_SAFE_BROWSING) safe_browsing::DownloadFileType::DangerLevel GetDangerLevel() const override; void SetDangerLevel( safe_browsing::DownloadFileType::DangerLevel danger_level) override; +#endif download::DownloadItem::InsecureDownloadStatus GetInsecureDownloadStatus() const override; void OpenUsingPlatformHandler() override; diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc @@ -41,7 +41,9 @@ #include "components/policy/core/browser/url_blocklist_manager.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_service.h" +#if defined(FULL_SAFE_BROWSING) #include "components/safe_browsing/content/common/file_type_policies.h" +#endif #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/save_page_type.h" @@ -67,7 +69,9 @@ using content::BrowserContext; using content::BrowserThread; using content::DownloadManager; +#if defined(FULL_SAFE_BROWSING) using safe_browsing::FileTypePolicies; +#endif namespace { @@ -268,14 +272,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profile_(profile) { base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) + extension); - // Note that the list of file types that are not allowed to open - // automatically can change in the future. When the list is tightened, it is - // expected that some entries in the users' auto open list will get dropped - // permanently as a result. - if (FileTypePolicies::GetInstance()->IsAllowedToOpenAutomatically( - filename_with_extension)) { - auto_open_by_user_.insert(extension); - } + auto_open_by_user_.insert(extension); } } @@ -460,10 +457,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(const GURL& url, bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension( const base::FilePath& file_name) { base::FilePath::StringType extension = file_name.Extension(); - if (!FileTypePolicies::GetInstance()->IsAllowedToOpenAutomatically( - file_name)) { - return false; - } DCHECK(extension[0] == base::FilePath::kExtensionSeparator); extension.erase(0, 1); diff --git a/chrome/browser/download/download_stats.cc b/chrome/browser/download/download_stats.cc --- a/chrome/browser/download/download_stats.cc +++ b/chrome/browser/download/download_stats.cc @@ -10,7 +10,9 @@ #include "build/build_config.h" #include "components/download/public/common/download_content.h" #include "components/profile_metrics/browser_profile_type.h" +#if defined(FULL_SAFE_BROWSING) #include "components/safe_browsing/content/browser/download/download_stats.h" +#endif void RecordDownloadCount(ChromeDownloadCountTypes type) { base::UmaHistogramEnumeration("Download.CountsChrome", type, @@ -29,8 +31,10 @@ void RecordDangerousDownloadWarningShown( bool has_user_gesture) { base::UmaHistogramEnumeration("Download.ShowedDownloadWarning", danger_type, download::DOWNLOAD_DANGER_TYPE_MAX); +#if defined(FULL_SAFE_BROWSING) safe_browsing::RecordDangerousDownloadWarningShown( danger_type, file_path, is_https, has_user_gesture); +#endif } void RecordOpenedDangerousConfirmDialog( @@ -45,6 +49,7 @@ void RecordDownloadOpen(ChromeDownloadOpenMethod open_method, base::RecordAction(base::UserMetricsAction("Download.Open")); base::UmaHistogramEnumeration("Download.OpenMethod", open_method, DOWNLOAD_OPEN_METHOD_LAST_ENTRY); +#if defined(FULL_SAFE_BROWSING) download::DownloadContent download_content = download::DownloadContentFromMimeType( mime_type_string, /*record_content_subcategory=*/false); @@ -61,6 +66,7 @@ void RecordDownloadOpen(ChromeDownloadOpenMethod open_method, } base::UmaHistogramEnumeration("Download.Open.ContentType", download_content, download::DownloadContent::MAX); +#endif } void RecordDownloadOpenButtonPressed(bool is_download_completed) { diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc @@ -32,9 +32,11 @@ #include "components/download/public/common/download_item.h" #include "components/history/core/browser/history_service.h" #include "components/prefs/pref_service.h" +#if defined(FULL_SAFE_BROWSING) #include "components/safe_browsing/content/browser/download/download_stats.h" #include "components/safe_browsing/content/common/file_type_policies.h" #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h" +#endif #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" @@ -75,13 +77,16 @@ using content::BrowserThread; using download::DownloadItem; using download::DownloadPathReservationTracker; +#if defined(FULL_SAFE_BROWSING) using safe_browsing::DownloadFileType; +#endif namespace { const base::FilePath::CharType kCrdownloadSuffix[] = FILE_PATH_LITERAL(".crdownload"); +#if defined(FULL_SAFE_BROWSING) // Condenses the results from HistoryService::GetVisibleVisitCountToHost() to a // single bool. A host is considered visited before if prior visible visits were // found in history and the first such visit was earlier than the most recent @@ -92,6 +97,7 @@ void VisitCountsToVisitedBefore(base::OnceCallback callback, result.success && result.count > 0 && (result.first_visit.LocalMidnight() < base::Time::Now().LocalMidnight())); } +#endif #if BUILDFLAG(IS_WIN) // Keeps track of whether Adobe Reader is up to date. @@ -130,7 +136,9 @@ DownloadTargetDeterminer::DownloadTargetDeterminer( create_target_directory_(false), conflict_action_(conflict_action), danger_type_(download->GetDangerType()), +#if defined(FULL_SAFE_BROWSING) danger_level_(DownloadFileType::NOT_DANGEROUS), +#endif virtual_path_(initial_virtual_path), is_filetype_handled_safely_(false), #if BUILDFLAG(IS_ANDROID) @@ -322,12 +330,14 @@ base::FilePath DownloadTargetDeterminer::GenerateFileName() const { download_->GetURL(), download_->GetContentDisposition(), referrer_charset, suggested_filename, sniffed_mime_type, default_filename); - // We don't replace the file extension if sfafe browsing consider the file +#if defined(FULL_SAFE_BROWSING) + // We don't replace the file extension if safe browsing consider the file // extension to be unsafe. Just let safe browsing scan the generated file. if (safe_browsing::FileTypePolicies::GetInstance()->IsCheckedBinaryFile( generated_filename)) { return generated_filename; } +#endif // If no mime type or explicitly specified a name, don't replace file // extension. @@ -959,6 +969,7 @@ DownloadTargetDeterminer::Result return CONTINUE; } +#if defined(FULL_SAFE_BROWSING) // First determine the danger level assuming that the user doesn't have any // prior visits to the referrer recoreded in history. The resulting danger // level would be ALLOW_ON_USER_GESTURE if the level depends on the visit @@ -995,6 +1006,7 @@ DownloadTargetDeterminer::Result // invalid, then assume the referrer has not been visited before. if (danger_type_ == download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS) danger_type_ = download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE; +#endif return CONTINUE; } @@ -1002,6 +1014,7 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone( bool visited_referrer_before) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_); +#if defined(FULL_SAFE_BROWSING) safe_browsing::RecordDownloadFileTypeAttributes( safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel( virtual_path_.BaseName(), download_->GetURL(), @@ -1013,6 +1026,7 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone( if (danger_level_ != DownloadFileType::NOT_DANGEROUS && danger_type_ == download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS) danger_type_ = download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE; +#endif DoLoop(); } @@ -1111,7 +1125,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf( << " Intermediate:" << intermediate_path_.AsUTF8Unsafe() << " Confirmation reason:" << static_cast(confirmation_reason_) << " Danger type:" << danger_type_ +#if defined(FULL_SAFE_BROWSING) << " Danger level:" << danger_level_ +#endif << " Result:" << static_cast(result); std::unique_ptr target_info(new DownloadTargetInfo); @@ -1123,7 +1139,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf( ? DownloadItem::TARGET_DISPOSITION_PROMPT : DownloadItem::TARGET_DISPOSITION_OVERWRITE); target_info->danger_type = danger_type_; +#if defined(FULL_SAFE_BROWSING) target_info->danger_level = danger_level_; +#endif target_info->intermediate_path = intermediate_path_; target_info->mime_type = mime_type_; target_info->is_filetype_handled_safely = is_filetype_handled_safely_; @@ -1250,54 +1268,11 @@ bool DownloadTargetDeterminer::HasPromptedForPath() const { DownloadItem::TARGET_DISPOSITION_PROMPT); } +#if defined(FULL_SAFE_BROWSING) DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( PriorVisitsToReferrer visits) const { DCHECK_CURRENTLY_ON(BrowserThread::UI); - - // If the user has has been prompted or will be, assume that the user has - // approved the download. A programmatic download is considered safe unless it - // contains malware. - if (HasPromptedForPath() || - confirmation_reason_ != DownloadConfirmationReason::NONE || - !download_->GetForcedFilePath().empty()) return DownloadFileType::NOT_DANGEROUS; - - // User-initiated extension downloads from pref-whitelisted sources are not - // considered dangerous. - if (download_->HasUserGesture() && - download_crx_util::IsTrustedExtensionDownload(GetProfile(), *download_)) { - return DownloadFileType::NOT_DANGEROUS; - } - - // Anything the user has marked auto-open is OK if it's user-initiated. - if (download_prefs_->IsAutoOpenEnabled(download_->GetURL(), virtual_path_) && - download_->HasUserGesture()) - return DownloadFileType::NOT_DANGEROUS; - - DownloadFileType::DangerLevel danger_level = - safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel( - virtual_path_.BaseName(), download_->GetURL(), - GetProfile()->GetPrefs()); - - // A danger level of ALLOW_ON_USER_GESTURE is used to label potentially - // dangerous file types that have a high frequency of legitimate use. We would - // like to avoid prompting for the legitimate cases as much as possible. To - // that end, we consider a download to be legitimate if one of the following - // is true, and avoid prompting: - // - // * The user navigated to the download URL via the omnibox (either by typing - // the URL, pasting it, or using search). - // - // * The navigation that initiated the download has a user gesture associated - // with it AND the user the user is familiar with the referring origin. A - // user is considered familiar with a referring origin if a visit for a page - // from the same origin was recorded on the previous day or earlier. - if (danger_level == DownloadFileType::ALLOW_ON_USER_GESTURE && - ((download_->GetTransitionType() & - ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0 || - (download_->HasUserGesture() && visits == VISITED_REFERRER))) - return DownloadFileType::NOT_DANGEROUS; - return danger_level; } absl::optional @@ -1311,6 +1286,7 @@ DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const { EventType::DANGEROUS_DOWNLOAD_BYPASS) : absl::nullopt; } +#endif void DownloadTargetDeterminer::OnDownloadDestroyed( DownloadItem* download) { diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/browser/download/download_target_determiner.h --- a/chrome/browser/download/download_target_determiner.h +++ b/chrome/browser/download/download_target_determiner.h @@ -19,7 +19,9 @@ #include "components/download/public/common/download_danger_type.h" #include "components/download/public/common/download_item.h" #include "components/download/public/common/download_path_reservation_tracker.h" +#if defined(FULL_SAFE_BROWSING) #include "components/safe_browsing/content/common/proto/download_file_types.pb.h" +#endif #include "content/public/browser/download_manager_delegate.h" #include "ppapi/buildflags/buildflags.h" @@ -345,6 +347,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer { // operation. bool HasPromptedForPath() const; +#if defined(FULL_SAFE_BROWSING) // Returns true if this download should show the "dangerous file" warning. // Various factors are considered, such as the type of the file, whether a // user action initiated the download, and whether the user has explicitly @@ -354,6 +357,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer { // to true if the download requires explicit user consent. safe_browsing::DownloadFileType::DangerLevel GetDangerLevel( PriorVisitsToReferrer visits) const; +#endif // Returns the timestamp of the last download bypass. absl::optional GetLastDownloadBypassTimestamp() const; @@ -373,7 +377,9 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer { download::DownloadPathReservationTracker::FilenameConflictAction conflict_action_; download::DownloadDangerType danger_type_; +#if defined(FULL_SAFE_BROWSING) safe_browsing::DownloadFileType::DangerLevel danger_level_; +#endif base::FilePath virtual_path_; base::FilePath local_path_; base::FilePath intermediate_path_; diff --git a/chrome/browser/download/download_target_info.cc b/chrome/browser/download/download_target_info.cc --- a/chrome/browser/download/download_target_info.cc +++ b/chrome/browser/download/download_target_info.cc @@ -4,12 +4,16 @@ #include "chrome/browser/download/download_target_info.h" +#if defined(FULL_SAFE_BROWSING) #include "components/safe_browsing/content/common/file_type_policies.h" +#endif DownloadTargetInfo::DownloadTargetInfo() : target_disposition(download::DownloadItem::TARGET_DISPOSITION_OVERWRITE), danger_type(download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS), +#if defined(FULL_SAFE_BROWSING) danger_level(safe_browsing::DownloadFileType::NOT_DANGEROUS), +#endif is_filetype_handled_safely(false), result(download::DOWNLOAD_INTERRUPT_REASON_NONE) {} diff --git a/chrome/browser/download/download_target_info.h b/chrome/browser/download/download_target_info.h --- a/chrome/browser/download/download_target_info.h +++ b/chrome/browser/download/download_target_info.h @@ -11,7 +11,9 @@ #include "components/download/public/common/download_danger_type.h" #include "components/download/public/common/download_interrupt_reasons.h" #include "components/download/public/common/download_item.h" +#if defined(FULL_SAFE_BROWSING) #include "components/safe_browsing/content/common/proto/download_file_types.pb.h" +#endif #include "third_party/abseil-cpp/absl/types/optional.h" struct DownloadTargetInfo { @@ -33,6 +35,7 @@ struct DownloadTargetInfo { // Danger type of the download. download::DownloadDangerType danger_type; +#if defined(FULL_SAFE_BROWSING) // The danger type of the download could be set to MAYBE_DANGEROUS_CONTENT if // the file type is handled by SafeBrowsing. However, if the SafeBrowsing // service is unable to verify whether the file is safe or not, we are on our @@ -58,6 +61,7 @@ struct DownloadTargetInfo { // SafeBrowsing may flag the file as being malicious, in which case the // malicious classification should take precedence. safe_browsing::DownloadFileType::DangerLevel danger_level; +#endif // Suggested intermediate path. The downloaded bytes should be written to this // path until all the bytes are available and the user has accepted a diff --git a/chrome/browser/download/download_ui_model.cc b/chrome/browser/download/download_ui_model.cc --- a/chrome/browser/download/download_ui_model.cc +++ b/chrome/browser/download/download_ui_model.cc @@ -40,7 +40,9 @@ using download::DownloadItem; using offline_items_collection::FailState; +#if defined(FULL_SAFE_BROWSING) using safe_browsing::DownloadFileType; +#endif namespace { @@ -471,12 +473,14 @@ bool DownloadUIModel::ShouldPreferOpeningInBrowser() { void DownloadUIModel::SetShouldPreferOpeningInBrowser(bool preference) {} +#if defined(FULL_SAFE_BROWSING) DownloadFileType::DangerLevel DownloadUIModel::GetDangerLevel() const { return DownloadFileType::NOT_DANGEROUS; } void DownloadUIModel::SetDangerLevel( DownloadFileType::DangerLevel danger_level) {} +#endif download::DownloadItem::InsecureDownloadStatus DownloadUIModel::GetInsecureDownloadStatus() const { diff --git a/chrome/browser/download/download_ui_model.h b/chrome/browser/download/download_ui_model.h --- a/chrome/browser/download/download_ui_model.h +++ b/chrome/browser/download/download_ui_model.h @@ -18,7 +18,9 @@ #include "components/download/public/common/download_item.h" #include "components/offline_items_collection/core/offline_item.h" #include "components/safe_browsing/buildflags.h" +#if defined(FULL_SAFE_BROWSING) #include "components/safe_browsing/content/common/proto/download_file_types.pb.h" +#endif #include "ui/base/models/image_model.h" #include "ui/color/color_id.h" #include "ui/gfx/vector_icon_types.h" @@ -355,6 +357,7 @@ class DownloadUIModel { // Change what's returned by ShouldPreferOpeningInBrowser to |preference|. virtual void SetShouldPreferOpeningInBrowser(bool preference); +#if defined(FULL_SAFE_BROWSING) // Return the danger level determined during download target determination. // The value returned here is independent of the danger level as determined by // the Safe Browsing. @@ -363,6 +366,7 @@ class DownloadUIModel { // Change what's returned by GetDangerLevel(). virtual void SetDangerLevel( safe_browsing::DownloadFileType::DangerLevel danger_level); +#endif // Return the mixed content status determined during download target // determination. diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc --- a/chrome/browser/extensions/api/downloads/downloads_api.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc @@ -37,7 +37,6 @@ #include "chrome/browser/download/bubble/download_bubble_prefs.h" #include "chrome/browser/download/download_core_service.h" #include "chrome/browser/download/download_core_service_factory.h" -#include "chrome/browser/download/download_danger_prompt.h" #include "chrome/browser/download/download_file_icon_extractor.h" #include "chrome/browser/download/download_open_prompt.h" #include "chrome/browser/download/download_prefs.h" @@ -1361,9 +1360,6 @@ DownloadsAcceptDangerFunction::DownloadsAcceptDangerFunction() {} DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {} -DownloadsAcceptDangerFunction::OnPromptCreatedCallback* - DownloadsAcceptDangerFunction::on_prompt_created_ = nullptr; - ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() { std::unique_ptr params( downloads::AcceptDanger::Params::Create(args())); @@ -1401,42 +1397,7 @@ void DownloadsAcceptDangerFunction::PromptOrWait(int download_id, int retries) { return; } RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER); - // DownloadDangerPrompt displays a modal dialog using native widgets that the - // user must either accept or cancel. It cannot be scripted. - DownloadDangerPrompt* prompt = DownloadDangerPrompt::Create( - download_item, web_contents, true, - base::BindOnce(&DownloadsAcceptDangerFunction::DangerPromptCallback, this, - download_id)); - // DownloadDangerPrompt deletes itself - if (on_prompt_created_ && !on_prompt_created_->is_null()) - std::move(*on_prompt_created_).Run(prompt); - // Function finishes in DangerPromptCallback(). -} - -void DownloadsAcceptDangerFunction::DangerPromptCallback( - int download_id, - DownloadDangerPrompt::Action action) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); - DownloadItem* download_item = GetDownload( - browser_context(), include_incognito_information(), download_id); - std::string error; - if (InvalidId(download_item, &error) || - Fault(download_item->GetState() != DownloadItem::IN_PROGRESS, - download_extension_errors::kNotInProgress, &error)) { - Respond(Error(std::move(error))); - return; - } - switch (action) { - case DownloadDangerPrompt::ACCEPT: - download_item->ValidateDangerousDownload(); - break; - case DownloadDangerPrompt::CANCEL: - download_item->Remove(); - break; - case DownloadDangerPrompt::DISMISS: - break; - } - Respond(NoArguments()); + download_item->ValidateDangerousDownload(); } DownloadsShowFunction::DownloadsShowFunction() {} diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/browser/extensions/api/downloads/downloads_api.h --- a/chrome/browser/extensions/api/downloads/downloads_api.h +++ b/chrome/browser/extensions/api/downloads/downloads_api.h @@ -13,7 +13,6 @@ #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "base/time/time.h" -#include "chrome/browser/download/download_danger_prompt.h" #include "chrome/common/extensions/api/downloads.h" #include "components/download/content/public/all_download_item_notifier.h" #include "components/download/public/common/download_path_reservation_tracker.h" @@ -201,13 +200,6 @@ class DownloadsRemoveFileFunction : public ExtensionFunction { class DownloadsAcceptDangerFunction : public ExtensionFunction { public: - using OnPromptCreatedCallback = - base::OnceCallback; - static void OnPromptCreatedForTesting( - OnPromptCreatedCallback* callback) { - on_prompt_created_ = callback; - } - DECLARE_EXTENSION_FUNCTION("downloads.acceptDanger", DOWNLOADS_ACCEPTDANGER) DownloadsAcceptDangerFunction(); @@ -219,13 +211,9 @@ class DownloadsAcceptDangerFunction : public ExtensionFunction { protected: ~DownloadsAcceptDangerFunction() override; - void DangerPromptCallback(int download_id, - DownloadDangerPrompt::Action action); private: void PromptOrWait(int download_id, int retries); - - static OnPromptCreatedCallback* on_prompt_created_; }; class DownloadsShowFunction : public ExtensionFunction { 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 @@ -1280,21 +1280,9 @@ WebstorePrivateGetExtensionStatusFunction::Run() { GetExtensionStatus::Params::Create(args())); EXTENSION_FUNCTION_VALIDATE(params); - const ExtensionId& extension_id = params->id; - - if (!crx_file::id_util::IdIsValid(extension_id)) { - return RespondNow(Error(kWebstoreInvalidIdError)); - } - - if (!params->manifest) - return RespondNow(BuildResponseWithoutManifest(extension_id)); - - data_decoder::DataDecoder::ParseJsonIsolated( - *(params->manifest), - base::BindOnce( - &WebstorePrivateGetExtensionStatusFunction::OnManifestParsed, this, - extension_id)); - return RespondLater(); + return RespondNow(ErrorWithArguments( + api::webstore_private::GetReferrerChain::Results::Create(""), + kWebstoreUserCancelledError)); } ExtensionFunction::ResponseValue diff --git 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 --- 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 @@ -32,7 +32,10 @@ #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/file_system_access/file_system_access_permission_request_manager.h" #include "chrome/browser/profiles/profile.h" +#if defined(FULL_SAFE_BROWSING) #include "chrome/browser/safe_browsing/download_protection/download_protection_util.h" +#include "components/safe_browsing/content/common/file_type_policies.h" +#endif #include "chrome/browser/ui/file_system_access_dialogs.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/pdf_util.h" @@ -41,7 +44,6 @@ #include "components/content_settings/core/common/content_settings.h" #include "components/permissions/permission_util.h" #include "components/safe_browsing/buildflags.h" -#include "components/safe_browsing/content/common/file_type_policies.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/disallow_activation_reason.h" @@ -119,6 +121,7 @@ const char kPathKey[] = "path"; const char kPathTypeKey[] = "path-type"; const char kTimestampKey[] = "timestamp"; +#if defined(FULL_SAFE_BROWSING) void ShowFileSystemAccessRestrictedDirectoryDialogOnUIThread( content::GlobalRenderFrameHostId frame_id, const url::Origin& origin, @@ -176,6 +179,7 @@ void ShowFileSystemAccessDangerousFileDialogOnUIThread( ShowFileSystemAccessDangerousFileDialog(origin, path, std::move(callback), web_contents); } +#endif #if BUILDFLAG(IS_WIN) bool ContainsInvalidDNSCharacter(base::FilePath::StringType hostname) { @@ -398,6 +402,7 @@ bool ShouldBlockAccessToPath(const base::FilePath& check_path, return true; } +#if defined(FULL_SAFE_BROWSING) void DoSafeBrowsingCheckOnUIThread( content::GlobalRenderFrameHostId frame_id, std::unique_ptr item, @@ -476,6 +481,7 @@ InterpretSafeBrowsingResult(safe_browsing::DownloadCheckResult result) { NOTREACHED(); return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult::kBlock; } +#endif std::string GenerateLastPickedDirectoryKey(const std::string& id) { return id.empty() ? kDefaultLastPickedDirectoryKey @@ -493,6 +499,7 @@ base::StringPiece GetGrantKeyFromGrantType(GrantType type) { : kPermissionReadableKey; } +#if defined(FULL_SAFE_BROWSING) bool FileHasDangerousExtension(const url::Origin& origin, const base::FilePath& path, Profile* profile) { @@ -504,6 +511,7 @@ bool FileHasDangerousExtension(const url::Origin& origin, return danger_level == safe_browsing::DownloadFileType::DANGEROUS || danger_level == safe_browsing::DownloadFileType::ALLOW_ON_USER_GESTURE; } +#endif } // namespace @@ -1334,6 +1342,7 @@ void ChromeFileSystemAccessPermissionContext::CheckPathAgainstBlocklist( std::move(callback)); } +#if defined(FULL_SAFE_BROWSING) void ChromeFileSystemAccessPermissionContext::PerformAfterWriteChecks( std::unique_ptr item, content::GlobalRenderFrameHostId frame_id, @@ -1356,6 +1365,7 @@ void ChromeFileSystemAccessPermissionContext::PerformAfterWriteChecks( base::SequencedTaskRunner::GetCurrentDefault(), std::move(callback)))); } +#endif void ChromeFileSystemAccessPermissionContext::DidCheckPathAgainstBlocklist( const url::Origin& origin, @@ -1366,7 +1376,7 @@ void ChromeFileSystemAccessPermissionContext::DidCheckPathAgainstBlocklist( base::OnceCallback callback, bool should_block) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - +#if defined(FULL_SAFE_BROWSING) if (user_action == UserAction::kNone) { std::move(callback).Run(should_block ? SensitiveEntryResult::kAbort : SensitiveEntryResult::kAllowed); @@ -1397,7 +1407,7 @@ void ChromeFileSystemAccessPermissionContext::DidCheckPathAgainstBlocklist( frame_id, origin, path, std::move(result_callback))); return; } - +#endif std::move(callback).Run(SensitiveEntryResult::kAllowed); } diff --git 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 --- 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 @@ -16,6 +16,7 @@ #include "base/time/default_clock.h" #include "base/timer/timer.h" #include "components/permissions/object_permission_context_base.h" +#include "components/safe_browsing/buildflags.h" #include "content/public/browser/file_system_access_permission_context.h" #include "third_party/blink/public/mojom/file_system_access/file_system_access_manager.mojom-forward.h" #include "third_party/blink/public/mojom/permissions/permission_status.mojom.h" @@ -90,10 +91,6 @@ class ChromeFileSystemAccessPermissionContext UserAction user_action, content::GlobalRenderFrameHostId frame_id, base::OnceCallback callback) override; - void PerformAfterWriteChecks( - std::unique_ptr item, - content::GlobalRenderFrameHostId frame_id, - base::OnceCallback callback) override; bool CanObtainReadPermission(const url::Origin& origin) override; bool CanObtainWritePermission(const url::Origin& origin) override; diff --git a/chrome/browser/lookalikes/lookalike_url_controller_client.cc b/chrome/browser/lookalikes/lookalike_url_controller_client.cc --- a/chrome/browser/lookalikes/lookalike_url_controller_client.cc +++ b/chrome/browser/lookalikes/lookalike_url_controller_client.cc @@ -56,8 +56,5 @@ void LookalikeUrlControllerClient::GoBack() { } void LookalikeUrlControllerClient::Proceed() { - LookalikeUrlService::Get( - Profile::FromBrowserContext(web_contents_->GetBrowserContext())) - ->SetUserIgnore(request_url_); Reload(); } diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc --- a/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc @@ -908,7 +908,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() { metrics_service_->RegisterMetricsProvider( std::make_unique()); #endif - #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) metrics_service_->RegisterMetricsProvider( std::make_unique()); diff --git a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc --- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc +++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc @@ -137,9 +137,6 @@ void TrialComparisonCertVerifierController::SendTrialReport( std::string serialized_report; if (!report.Serialize(&serialized_report)) return; - - CertificateReportingServiceFactory::GetForBrowserContext(profile_)->Send( - serialized_report); } // static 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 @@ -124,10 +124,10 @@ #include "ui/base/data_transfer_policy/data_transfer_endpoint.h" #include "url/url_constants.h" +#include "third_party/blink/public/mojom/clipboard/clipboard.mojom.h" #if BUILDFLAG(SAFE_BROWSING_AVAILABLE) #include "chrome/browser/safe_browsing/advanced_protection_status_manager.h" #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h" -#include "third_party/blink/public/mojom/clipboard/clipboard.mojom.h" #endif #if BUILDFLAG(IS_ANDROID) @@ -888,21 +888,13 @@ autofill::LanguageCode ChromePasswordManagerClient::GetPageLanguage() const { safe_browsing::PasswordProtectionService* ChromePasswordManagerClient::GetPasswordProtectionService() const { - return safe_browsing::ChromePasswordProtectionService:: - GetPasswordProtectionService(profile_); + return nullptr; } #if defined(ON_FOCUS_PING_ENABLED) void ChromePasswordManagerClient::CheckSafeBrowsingReputation( const GURL& form_action, const GURL& frame_url) { - safe_browsing::PasswordProtectionService* pps = - GetPasswordProtectionService(); - if (pps) { - pps->MaybeStartPasswordFieldOnFocusRequest( - web_contents(), web_contents()->GetLastCommittedURL(), form_action, - frame_url, pps->GetAccountInfo().hosted_domain); - } } #endif // defined(ON_FOCUS_PING_ENABLED) @@ -914,15 +906,6 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry( bool password_field_exists, uint64_t reused_password_hash, const std::string& domain) { - safe_browsing::PasswordProtectionService* pps = - GetPasswordProtectionService(); - if (!pps) - return; - - pps->MaybeStartProtectedPasswordEntryRequest( - web_contents(), web_contents()->GetLastCommittedURL(), username, - password_type, matching_reused_credentials, password_field_exists); - #if !BUILDFLAG(IS_ANDROID) // If the webpage is not an extension page, do nothing. if (!GURL(domain).SchemeIs(kExtensionScheme)) { @@ -961,11 +944,6 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry( } void ChromePasswordManagerClient::LogPasswordReuseDetectedEvent() { - safe_browsing::PasswordProtectionService* pps = - GetPasswordProtectionService(); - if (pps) { - pps->MaybeLogPasswordReuseDetectedEvent(web_contents()); - } } #if !BUILDFLAG(IS_ANDROID) @@ -1578,6 +1556,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage( is_enabled = false; } +#if BUILDFLAG(FULL_SAFE_BROWSING) // 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 @@ -1588,6 +1567,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage( observer->OnPasswordSaveOrAutofillDenied(); is_enabled = false; } +#endif if (log_manager_->IsLoggingActive()) { password_manager::BrowserSavePasswordProgressLogger logger( diff --git a/chrome/browser/permissions/chrome_permissions_client.cc b/chrome/browser/permissions/chrome_permissions_client.cc --- a/chrome/browser/permissions/chrome_permissions_client.cc +++ b/chrome/browser/permissions/chrome_permissions_client.cc @@ -20,7 +20,6 @@ #include "chrome/browser/engagement/important_sites_util.h" #include "chrome/browser/metrics/ukm_background_recorder_service.h" #include "chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.h" -#include "chrome/browser/permissions/contextual_notification_permission_ui_selector.h" #include "chrome/browser/permissions/origin_keyed_permission_action_service_factory.h" #include "chrome/browser/permissions/permission_actions_history_factory.h" #include "chrome/browser/permissions/permission_decision_auto_blocker_factory.h" @@ -313,19 +312,6 @@ ChromePermissionsClient::DetermineIgnoreReason( } #endif -std::vector> -ChromePermissionsClient::CreatePermissionUiSelectors( - content::BrowserContext* browser_context) { - std::vector> selectors; - selectors.emplace_back( - std::make_unique()); - selectors.emplace_back(std::make_unique( - Profile::FromBrowserContext(browser_context))); - selectors.emplace_back(std::make_unique( - Profile::FromBrowserContext(browser_context))); - return selectors; -} - void ChromePermissionsClient::OnPromptResolved( permissions::RequestType request_type, permissions::PermissionAction action, diff --git a/chrome/browser/permissions/chrome_permissions_client.h b/chrome/browser/permissions/chrome_permissions_client.h --- a/chrome/browser/permissions/chrome_permissions_client.h +++ b/chrome/browser/permissions/chrome_permissions_client.h @@ -52,9 +52,6 @@ class ChromePermissionsClient : public permissions::PermissionsClient { GetUkmSourceIdCallback callback) override; permissions::IconId GetOverrideIconId( permissions::RequestType request_type) override; - std::vector> - CreatePermissionUiSelectors( - content::BrowserContext* browser_context) override; #if !BUILDFLAG(IS_ANDROID) void TriggerPromptHatsSurveyIfEnabled( diff --git a/chrome/browser/permissions/permission_revocation_request.cc b/chrome/browser/permissions/permission_revocation_request.cc --- a/chrome/browser/permissions/permission_revocation_request.cc +++ b/chrome/browser/permissions/permission_revocation_request.cc @@ -145,6 +145,7 @@ void PermissionRevocationRequest::CheckAndRevokeIfBlocklisted() { return; } +#if BUILDFLAG(FULL_SAFE_BROWSING) CrowdDenyPreloadData* crowd_deny = CrowdDenyPreloadData::GetInstance(); permissions::PermissionUmaUtil::RecordCrowdDenyVersionAtAbuseCheckTime( crowd_deny->version_on_disk()); @@ -156,10 +157,14 @@ void PermissionRevocationRequest::CheckAndRevokeIfBlocklisted() { url::Origin::Create(origin_), base::BindOnce(&PermissionRevocationRequest::OnSiteReputationReady, weak_factory_.GetWeakPtr())); +#else + NotifyCallback(Outcome::PERMISSION_NOT_REVOKED); +#endif } void PermissionRevocationRequest::OnSiteReputationReady( const CrowdDenyPreloadData::SiteReputation* site_reputation) { +#if BUILDFLAG(FULL_SAFE_BROWSING) if (crowd_deny_request_start_time_.has_value()) { crowd_deny_request_duration_ = base::TimeTicks::Now() - crowd_deny_request_start_time_.value(); @@ -192,6 +197,7 @@ void PermissionRevocationRequest::OnSiteReputationReady( return; } } +#endif NotifyCallback(Outcome::PERMISSION_NOT_REVOKED); } diff --git a/chrome/browser/permissions/quiet_notification_permission_ui_config.cc b/chrome/browser/permissions/quiet_notification_permission_ui_config.cc --- a/chrome/browser/permissions/quiet_notification_permission_ui_config.cc +++ b/chrome/browser/permissions/quiet_notification_permission_ui_config.cc @@ -89,8 +89,8 @@ bool QuietNotificationPermissionUiConfig::IsCrowdDenyTriggeringEnabled() { return false; return base::GetFieldTrialParamByFeatureAsBool( - features::kQuietNotificationPrompts, kEnableCrowdDenyTriggering, - true /* default */); + features::kQuietNotificationPrompts, kEnableCrowdDenyTriggering, // disabled by default in Bromite + false /* default */); } // static 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 @@ -9,6 +9,7 @@ #include "base/trace_event/trace_event.h" #include "build/branding_buildflags.h" #include "build/build_config.h" +#include "components/safe_browsing/buildflags.h" #include "build/chromecast_buildflags.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/about_flags.h" @@ -1371,7 +1372,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, PushMessagingAppIdentifier::RegisterProfilePrefs(registry); QuietNotificationPermissionUiState::RegisterProfilePrefs(registry); RegisterBrowserUserPrefs(registry); +#if BUILDFLAG(SAFE_BROWSING_AVAILABLE) safe_browsing::file_type::RegisterProfilePrefs(registry); +#endif safe_browsing::RegisterProfilePrefs(registry); SearchPrefetchService::RegisterProfilePrefs(registry); blocked_content::SafeBrowsingTriggeredPopupBlocker::RegisterProfilePrefs( diff --git a/chrome/browser/privacy_guide/android/BUILD.gn b/chrome/browser/privacy_guide/android/BUILD.gn --- a/chrome/browser/privacy_guide/android/BUILD.gn +++ b/chrome/browser/privacy_guide/android/BUILD.gn @@ -18,7 +18,6 @@ android_library("java") { "java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideMetricsDelegate.java", "java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapter.java", "java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideUtils.java", - "java/src/org/chromium/chrome/browser/privacy_guide/SafeBrowsingFragment.java", "java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandler.java", "java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java", "java/src/org/chromium/chrome/browser/privacy_guide/WelcomeFragment.java", @@ -63,7 +62,6 @@ robolectric_library("junit") { "junit/src/org/chromium/chrome/browser/privacy_guide/NavbarVisibilityDelegateTest.java", "junit/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideMetricsDelegateTest.java", "junit/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapterTest.java", - "junit/src/org/chromium/chrome/browser/privacy_guide/SafeBrowsingFragmentTest.java", "junit/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImplTest.java", ] deps = [ diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java --- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java +++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java @@ -178,9 +178,6 @@ public class PrivacyGuideFragment extends Fragment { @Override public void onAttachFragment(@NonNull Fragment childFragment) { - if (childFragment instanceof SafeBrowsingFragment) { - ((SafeBrowsingFragment) childFragment).setBottomSheetController(mBottomSheetController); - } if (childFragment instanceof DoneFragment) { DoneFragment doneFragment = (DoneFragment) childFragment; doneFragment.setCustomTabIntentHelper(mCustomTabHelper); diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapter.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapter.java --- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapter.java +++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapter.java @@ -70,8 +70,6 @@ public class PrivacyGuidePagerAdapter extends FragmentStateAdapter { return new MSBBFragment(); case PrivacyGuideFragment.FragmentType.HISTORY_SYNC: return new HistorySyncFragment(); - case PrivacyGuideFragment.FragmentType.SAFE_BROWSING: - return new SafeBrowsingFragment(); case PrivacyGuideFragment.FragmentType.COOKIES: return new CookiesFragment(); case PrivacyGuideFragment.FragmentType.DONE: diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideUtils.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideUtils.java --- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideUtils.java +++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideUtils.java @@ -11,7 +11,6 @@ import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.safe_browsing.SafeBrowsingBridge; import org.chromium.chrome.browser.safe_browsing.SafeBrowsingState; import org.chromium.chrome.browser.signin.services.IdentityServicesProvider; -import org.chromium.chrome.browser.signin.services.UnifiedConsentServiceBridge; import org.chromium.chrome.browser.sync.SyncService; import org.chromium.components.content_settings.CookieControlsMode; import org.chromium.components.content_settings.PrefNames; @@ -28,8 +27,7 @@ import java.util.Set; */ class PrivacyGuideUtils { static boolean isMsbbEnabled() { - return UnifiedConsentServiceBridge.isUrlKeyedAnonymizedDataCollectionEnabled( - Profile.getLastUsedRegularProfile()); + return false; } static boolean isHistorySyncEnabled() { @@ -44,7 +42,7 @@ class PrivacyGuideUtils { } static @SafeBrowsingState int getSafeBrowsingState() { - return SafeBrowsingBridge.getSafeBrowsingState(); + return SafeBrowsingState.NO_SAFE_BROWSING; } static @CookieControlsMode int getCookieControlsMode() { diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java --- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java +++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java @@ -23,7 +23,7 @@ class StepDisplayHandlerImpl implements StepDisplayHandler { @Override public boolean shouldDisplaySafeBrowsing() { - return PrivacyGuideUtils.getSafeBrowsingState() != SafeBrowsingState.NO_SAFE_BROWSING; + return false; } @Override diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc @@ -122,7 +122,6 @@ #include "chrome/browser/push_messaging/push_messaging_service_factory.h" #include "chrome/browser/reading_list/reading_list_model_factory.h" #include "chrome/browser/reduce_accept_language/reduce_accept_language_factory.h" -#include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h" #include "chrome/browser/safe_browsing/chrome_password_protection_service_factory.h" #include "chrome/browser/safe_browsing/client_side_detection_service_factory.h" #include "chrome/browser/safe_browsing/safe_browsing_metrics_collector_factory.h" @@ -520,7 +519,6 @@ void ChromeBrowserMainExtraPartsProfiles:: CertDbInitializerFactory::GetInstance(); #endif #if BUILDFLAG(SAFE_BROWSING_AVAILABLE) - CertificateReportingServiceFactory::GetInstance(); #endif #if BUILDFLAG(ENABLE_SUPERVISED_USERS) ChildAccountServiceFactory::GetInstance(); @@ -830,12 +828,6 @@ void ChromeBrowserMainExtraPartsProfiles:: safe_browsing::ExtensionTelemetryServiceFactory::GetInstance(); safe_browsing::HashRealTimeServiceFactory::GetInstance(); #endif - safe_browsing::ChromePasswordProtectionServiceFactory::GetInstance(); - safe_browsing::ClientSideDetectionServiceFactory::GetInstance(); - safe_browsing::RealTimeUrlLookupServiceFactory::GetInstance(); - safe_browsing::SafeBrowsingMetricsCollectorFactory::GetInstance(); - safe_browsing::SafeBrowsingNavigationObserverManagerFactory::GetInstance(); - safe_browsing::VerdictCacheManagerFactory::GetInstance(); #if BUILDFLAG(IS_MAC) if (screentime::IsScreenTimeEnabled()) { screentime::HistoryBridgeFactory::GetInstance(); @@ -884,7 +876,9 @@ void ChromeBrowserMainExtraPartsProfiles:: } #endif TabRestoreServiceFactory::GetInstance(); +#if BUILDFLAG(FULL_SAFE_BROWSING) safe_browsing::TailoredSecurityServiceFactory::GetInstance(); +#endif TemplateURLFetcherFactory::GetInstance(); TemplateURLServiceFactory::GetInstance(); #if !BUILDFLAG(IS_ANDROID) diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -94,7 +94,6 @@ #include "chrome/browser/push_messaging/push_messaging_service_factory.h" #include "chrome/browser/push_messaging/push_messaging_service_impl.h" #include "chrome/browser/reduce_accept_language/reduce_accept_language_factory.h" -#include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/sessions/exit_type_service.h" #include "chrome/browser/sharing/sharing_service_factory.h" #include "chrome/browser/signin/identity_manager_factory.h" @@ -632,6 +631,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async_prefs) { mojo::PendingRemote pref_validation_delegate; +#if defined(FULL_SAFE_BROWSING) scoped_refptr safe_browsing_service( g_browser_process->safe_browsing_service()); if (safe_browsing_service.get()) { @@ -643,7 +643,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async_prefs) { pref_validation_delegate.InitWithNewPipeAndPassReceiver()); } } - +#endif prefs_ = CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false), profile_policy_connector_->policy_service(), 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 @@ -7,6 +7,7 @@ import("//components/safe_browsing/buildflags.gni") import("//extensions/buildflags/buildflags.gni") static_library("safe_browsing") { + if (false) { sources = [ "chrome_controller_client.cc", "chrome_controller_client.h", @@ -43,7 +44,6 @@ static_library("safe_browsing") { "//components/resources:components_resources_grit", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", - "//components/safe_browsing/content/browser:client_side_detection", "//components/safe_browsing/content/browser/triggers:suspicious_site_trigger", "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/core/browser", @@ -96,6 +96,7 @@ static_library("safe_browsing") { "//extensions/browser", ] } + } if (safe_browsing_mode != 0) { # "Safe Browsing Basic" files used for safe browsing in full mode @@ -182,7 +183,6 @@ static_library("safe_browsing") { "//components/safe_browsing/content/browser/triggers:ad_sampler_trigger", "//components/safe_browsing/content/browser/triggers:suspicious_site_trigger", "//components/safe_browsing/content/browser/triggers:trigger_throttler", - "//components/safe_browsing/content/common:file_type_policies", "//components/safe_browsing/core/browser", "//components/safe_browsing/core/browser:token_fetcher", "//components/safe_browsing/core/browser:verdict_cache_manager", diff --git a/chrome/browser/safe_browsing/android/BUILD.gn b/chrome/browser/safe_browsing/android/BUILD.gn --- a/chrome/browser/safe_browsing/android/BUILD.gn +++ b/chrome/browser/safe_browsing/android/BUILD.gn @@ -17,7 +17,6 @@ source_set("android") { deps = [ ":jni_headers", "//chrome/browser/profiles:profile", - "//chrome/browser/safe_browsing:advanced_protection", "//components/password_manager/core/browser/leak_detection", "//components/password_manager/core/common", "//components/prefs", @@ -41,12 +40,8 @@ source_set("android") { android_library("java") { sources = [ "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java", - "java/src/org/chromium/chrome/browser/safe_browsing/settings/EnhancedProtectionSettingsFragment.java", "java/src/org/chromium/chrome/browser/safe_browsing/settings/NoProtectionConfirmationDialog.java", "java/src/org/chromium/chrome/browser/safe_browsing/settings/RadioButtonGroupSafeBrowsingPreference.java", - "java/src/org/chromium/chrome/browser/safe_browsing/settings/SafeBrowsingSettingsFragment.java", - "java/src/org/chromium/chrome/browser/safe_browsing/settings/SafeBrowsingSettingsFragmentBase.java", - "java/src/org/chromium/chrome/browser/safe_browsing/settings/StandardProtectionSettingsFragment.java", ] deps = [ ":java_resources", diff --git a/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java b/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java --- a/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java +++ b/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java @@ -14,95 +14,4 @@ import org.chromium.base.annotations.NativeMethods; */ @JNINamespace("safe_browsing") public final class SafeBrowsingBridge { - /** - * Reports UMA values based on files' extensions. - * - * @param path The file path. - * @return The UMA value for the file. - */ - public static int umaValueForFile(String path) { - return SafeBrowsingBridgeJni.get().umaValueForFile(path); - } - - /** - * @return Whether Safe Browsing Extended Reporting is currently enabled. - */ - public static boolean isSafeBrowsingExtendedReportingEnabled() { - return SafeBrowsingBridgeJni.get().getSafeBrowsingExtendedReportingEnabled(); - } - - /** - * @param enabled Whether Safe Browsing Extended Reporting should be enabled. - */ - public static void setSafeBrowsingExtendedReportingEnabled(boolean enabled) { - SafeBrowsingBridgeJni.get().setSafeBrowsingExtendedReportingEnabled(enabled); - } - - /** - * @return Whether Safe Browsing Extended Reporting is managed - */ - public static boolean isSafeBrowsingExtendedReportingManaged() { - return SafeBrowsingBridgeJni.get().getSafeBrowsingExtendedReportingManaged(); - } - - /** - * @return The Safe Browsing state. It can be Enhanced Protection, Standard Protection, or No - * Protection. - */ - public static @SafeBrowsingState int getSafeBrowsingState() { - return SafeBrowsingBridgeJni.get().getSafeBrowsingState(); - } - - /** - * @param state Set the Safe Browsing state. It can be Enhanced Protection, Standard Protection, - * or No Protection. - */ - public static void setSafeBrowsingState(@SafeBrowsingState int state) { - SafeBrowsingBridgeJni.get().setSafeBrowsingState(state); - } - - /** - * @return Whether the Safe Browsing preference is managed. It can be managed by either - * the SafeBrowsingEnabled policy(legacy) or the SafeBrowsingProtectionLevel policy(new). - */ - public static boolean isSafeBrowsingManaged() { - return SafeBrowsingBridgeJni.get().isSafeBrowsingManaged(); - } - - /** - * @return Whether there is a Google account to use for the leak detection check. - */ - public static boolean hasAccountForLeakCheckRequest() { - return SafeBrowsingBridgeJni.get().hasAccountForLeakCheckRequest(); - } - - /** - * @return Whether the Leak Detection for signed out users feature is enabled. - */ - public static boolean isLeakDetectionUnauthenticatedEnabled() { - return SafeBrowsingBridgeJni.get().isLeakDetectionUnauthenticatedEnabled(); - } - - /** - * @return Whether the user is under Advanced Protection. - */ - public static boolean isUnderAdvancedProtection() { - return SafeBrowsingBridgeJni.get().isUnderAdvancedProtection(); - } - - @NativeMethods - @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE) - public interface Natives { - int umaValueForFile(String path); - boolean getSafeBrowsingExtendedReportingEnabled(); - void setSafeBrowsingExtendedReportingEnabled(boolean enabled); - boolean getSafeBrowsingExtendedReportingManaged(); - @SafeBrowsingState - int getSafeBrowsingState(); - void setSafeBrowsingState(@SafeBrowsingState int state); - boolean isSafeBrowsingManaged(); - boolean hasAccountForLeakCheckRequest(); - boolean isLeakDetectionUnauthenticatedEnabled(); - boolean isUnderAdvancedProtection(); - } } diff --git a/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc b/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc --- a/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc +++ b/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc @@ -36,65 +36,6 @@ PrefService* GetPrefService() { namespace safe_browsing { -static jint JNI_SafeBrowsingBridge_UmaValueForFile( - JNIEnv* env, - const base::android::JavaParamRef& path) { - base::FilePath file_path(ConvertJavaStringToUTF8(env, path)); - return safe_browsing::FileTypePolicies::GetInstance()->UmaValueForFile( - file_path); -} - -static jboolean JNI_SafeBrowsingBridge_GetSafeBrowsingExtendedReportingEnabled( - JNIEnv* env) { - return safe_browsing::IsExtendedReportingEnabled(*GetPrefService()); -} - -static void JNI_SafeBrowsingBridge_SetSafeBrowsingExtendedReportingEnabled( - JNIEnv* env, - jboolean enabled) { - safe_browsing::SetExtendedReportingPrefAndMetric( - GetPrefService(), enabled, - safe_browsing::SBER_OPTIN_SITE_ANDROID_SETTINGS); -} - -static jboolean JNI_SafeBrowsingBridge_GetSafeBrowsingExtendedReportingManaged( - JNIEnv* env) { - PrefService* pref_service = GetPrefService(); - return pref_service->IsManagedPreference( - prefs::kSafeBrowsingScoutReportingEnabled); -} - -static jint JNI_SafeBrowsingBridge_GetSafeBrowsingState(JNIEnv* env) { - return static_cast( - safe_browsing::GetSafeBrowsingState(*GetPrefService())); -} - -static void JNI_SafeBrowsingBridge_SetSafeBrowsingState(JNIEnv* env, - jint state) { - return safe_browsing::SetSafeBrowsingState( - GetPrefService(), static_cast(state), - /*is_esb_enabled_in_sync=*/false); -} - -static jboolean JNI_SafeBrowsingBridge_IsSafeBrowsingManaged(JNIEnv* env) { - return safe_browsing::IsSafeBrowsingPolicyManaged(*GetPrefService()); -} - -static jboolean JNI_SafeBrowsingBridge_HasAccountForLeakCheckRequest( - JNIEnv* env) { - signin::IdentityManager* identity_manager = - IdentityManagerFactory::GetForProfile( - ProfileManager::GetLastUsedProfile()); - return password_manager::LeakDetectionCheckImpl::HasAccountForRequest( - identity_manager); -} - -static jboolean JNI_SafeBrowsingBridge_IsLeakDetectionUnauthenticatedEnabled( - JNIEnv* env) { - return base::FeatureList::IsEnabled( - password_manager::features::kLeakDetectionUnauthenticated); -} - static jboolean JNI_SafeBrowsingBridge_IsUnderAdvancedProtection(JNIEnv* env) { Profile* profile = ProfileManager::GetActiveUserProfile()->GetOriginalProfile(); diff --git a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc --- a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc @@ -807,11 +807,13 @@ void DownloadProtectionService::RequestFinished(DeepScanningRequest* request) { deep_scanning_requests_.erase(it); } +#if BUILDFLAG(FULL_SAFE_BROWSING) BinaryUploadService* DownloadProtectionService::GetBinaryUploadService( Profile* profile, const enterprise_connectors::AnalysisSettings& settings) { return BinaryUploadService::GetForProfile(profile, settings); } +#endif SafeBrowsingNavigationObserverManager* DownloadProtectionService::GetNavigationObserverManager( diff --git a/chrome/browser/safe_browsing/download_protection/download_protection_service.h b/chrome/browser/safe_browsing/download_protection/download_protection_service.h --- a/chrome/browser/safe_browsing/download_protection/download_protection_service.h +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service.h @@ -25,7 +25,6 @@ #include "base/supports_user_data.h" #include "chrome/browser/download/download_commands.h" #include "chrome/browser/enterprise/connectors/common.h" -#include "chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.h" #include "chrome/browser/safe_browsing/download_protection/deep_scanning_request.h" #include "chrome/browser/safe_browsing/download_protection/download_protection_observer.h" #include "chrome/browser/safe_browsing/download_protection/download_protection_util.h" @@ -332,11 +331,13 @@ class DownloadProtectionService { void OnDangerousDownloadOpened(const download::DownloadItem* item, Profile* profile); +#if BUILDFLAG(FULL_SAFE_BROWSING) // Get the BinaryUploadService for the given |profile|. Virtual so it can be // overridden in tests. virtual BinaryUploadService* GetBinaryUploadService( Profile* profile, const enterprise_connectors::AnalysisSettings& settings); +#endif // Get the SafeBrowsingNavigationObserverManager for the given |web_contents|. SafeBrowsingNavigationObserverManager* GetNavigationObserverManager( diff --git a/chrome/browser/safe_browsing/url_lookup_service_factory.cc b/chrome/browser/safe_browsing/url_lookup_service_factory.cc --- a/chrome/browser/safe_browsing/url_lookup_service_factory.cc +++ b/chrome/browser/safe_browsing/url_lookup_service_factory.cc @@ -56,6 +56,7 @@ RealTimeUrlLookupServiceFactory::RealTimeUrlLookupServiceFactory() KeyedService* RealTimeUrlLookupServiceFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { +#if BUILDFLAG(FULL_SAFE_BROWSING) if (!g_browser_process->safe_browsing_service()) { return nullptr; } @@ -78,6 +79,9 @@ KeyedService* RealTimeUrlLookupServiceFactory::BuildServiceInstanceFor( profile->IsOffTheRecord(), g_browser_process->variations_service(), SafeBrowsingNavigationObserverManagerFactory::GetForBrowserContext( profile)); +#else + return nullptr; +#endif } } // namespace safe_browsing diff --git a/chrome/browser/ssl/generated_https_first_mode_pref.cc b/chrome/browser/ssl/generated_https_first_mode_pref.cc --- a/chrome/browser/ssl/generated_https_first_mode_pref.cc +++ b/chrome/browser/ssl/generated_https_first_mode_pref.cc @@ -27,20 +27,6 @@ GeneratedHttpsFirstModePref::GeneratedHttpsFirstModePref(Profile* profile) base::BindRepeating( &GeneratedHttpsFirstModePref::OnSourcePreferencesChanged, base::Unretained(this))); - - // Track Advanced Protection status. - if (base::FeatureList::IsEnabled( - features::kHttpsFirstModeForAdvancedProtectionUsers)) { - obs_.Observe( - safe_browsing::AdvancedProtectionStatusManagerFactory::GetForProfile( - profile_)); - // On startup, AdvancedProtectionStatusManager runs before this class so we - // don't get called back. Run the callback to get the AP setting. - OnAdvancedProtectionStatusChanged( - safe_browsing::AdvancedProtectionStatusManagerFactory::GetForProfile( - profile_) - ->IsUnderAdvancedProtection()); - } } GeneratedHttpsFirstModePref::~GeneratedHttpsFirstModePref() = default; @@ -49,13 +35,6 @@ void GeneratedHttpsFirstModePref::OnSourcePreferencesChanged() { NotifyObservers(kGeneratedHttpsFirstModePref); } -void GeneratedHttpsFirstModePref::OnAdvancedProtectionStatusChanged( - bool enabled) { - DCHECK(base::FeatureList::IsEnabled( - features::kHttpsFirstModeForAdvancedProtectionUsers)); - NotifyObservers(kGeneratedHttpsFirstModePref); -} - extensions::settings_private::SetPrefResult GeneratedHttpsFirstModePref::SetPref(const base::Value* value) { if (!value->is_bool()) { @@ -74,10 +53,7 @@ GeneratedHttpsFirstModePref::SetPref(const base::Value* value) { } settings_api::PrefObject GeneratedHttpsFirstModePref::GetPrefObject() const { - bool is_advanced_protection_enabled = - safe_browsing::AdvancedProtectionStatusManagerFactory::GetForProfile( - profile_) - ->IsUnderAdvancedProtection(); + bool is_advanced_protection_enabled = false; auto* backing_preference = profile_->GetPrefs()->FindPreference(prefs::kHttpsOnlyModeEnabled); diff --git a/chrome/browser/ssl/generated_https_first_mode_pref.h b/chrome/browser/ssl/generated_https_first_mode_pref.h --- a/chrome/browser/ssl/generated_https_first_mode_pref.h +++ b/chrome/browser/ssl/generated_https_first_mode_pref.h @@ -18,9 +18,7 @@ extern const char kGeneratedHttpsFirstModePref[]; class GeneratedHttpsFirstModePref - : public extensions::settings_private::GeneratedPref, - public safe_browsing::AdvancedProtectionStatusManager:: - StatusChangedObserver { + : public extensions::settings_private::GeneratedPref { public: explicit GeneratedHttpsFirstModePref(Profile* profile); ~GeneratedHttpsFirstModePref() override; @@ -33,18 +31,10 @@ class GeneratedHttpsFirstModePref // Fired when preferences used to generate this preference are changed. void OnSourcePreferencesChanged(); - // safe_browsing::AdvancedProtectionStatusManager::StatusChangedObserver: - void OnAdvancedProtectionStatusChanged(bool enabled) override; - private: // Non-owning pointer to the profile this preference is generated for. const raw_ptr profile_; PrefChangeRegistrar user_prefs_registrar_; - - base::ScopedObservation< - safe_browsing::AdvancedProtectionStatusManager, - safe_browsing::AdvancedProtectionStatusManager::StatusChangedObserver> - obs_{this}; }; #endif // CHROME_BROWSER_SSL_GENERATED_HTTPS_FIRST_MODE_PREF_H_ diff --git a/chrome/browser/ssl/https_first_mode_settings_tracker.cc b/chrome/browser/ssl/https_first_mode_settings_tracker.cc --- a/chrome/browser/ssl/https_first_mode_settings_tracker.cc +++ b/chrome/browser/ssl/https_first_mode_settings_tracker.cc @@ -38,20 +38,6 @@ HttpsFirstModeService::HttpsFirstModeService(Profile* profile) base::BindRepeating(&HttpsFirstModeService::OnHttpsFirstModePrefChanged, base::Unretained(this))); - // Track Advanced Protection status. - if (base::FeatureList::IsEnabled( - features::kHttpsFirstModeForAdvancedProtectionUsers)) { - obs_.Observe( - safe_browsing::AdvancedProtectionStatusManagerFactory::GetForProfile( - profile_)); - // On startup, AdvancedProtectionStatusManager runs before this class so we - // don't get called back. Run the callback to get the AP setting. - OnAdvancedProtectionStatusChanged( - safe_browsing::AdvancedProtectionStatusManagerFactory::GetForProfile( - profile_) - ->IsUnderAdvancedProtection()); - } - // Make sure the pref state is logged and the synthetic field trial state is // created at startup (as the pref may never change over the session). bool enabled = profile_->GetPrefs()->GetBoolean(prefs::kHttpsOnlyModeEnabled); @@ -106,8 +92,6 @@ HttpsFirstModeServiceFactory::HttpsFirstModeServiceFactory() // Incognito (which uses the settings of the main profile) and Guest // Mode. ProfileSelections::BuildForRegularProfile()) { - DependsOn( - safe_browsing::AdvancedProtectionStatusManagerFactory::GetInstance()); } HttpsFirstModeServiceFactory::~HttpsFirstModeServiceFactory() = default; diff --git a/chrome/browser/ssl/https_first_mode_settings_tracker.h b/chrome/browser/ssl/https_first_mode_settings_tracker.h --- a/chrome/browser/ssl/https_first_mode_settings_tracker.h +++ b/chrome/browser/ssl/https_first_mode_settings_tracker.h @@ -21,9 +21,7 @@ class Profile; // field trial based on that state. // - Changing the pref based on user's Advanced Protection status. class HttpsFirstModeService - : public KeyedService, - public safe_browsing::AdvancedProtectionStatusManager:: - StatusChangedObserver { + : public KeyedService { public: explicit HttpsFirstModeService(Profile* profile); ~HttpsFirstModeService() override; @@ -32,17 +30,13 @@ class HttpsFirstModeService HttpsFirstModeService& operator=(const HttpsFirstModeService&) = delete; // safe_browsing::AdvancedProtectionStatusManager::StatusChangedObserver: - void OnAdvancedProtectionStatusChanged(bool enabled) override; + void OnAdvancedProtectionStatusChanged(bool enabled); private: void OnHttpsFirstModePrefChanged(); raw_ptr profile_; PrefChangeRegistrar pref_change_registrar_; - base::ScopedObservation< - safe_browsing::AdvancedProtectionStatusManager, - safe_browsing::AdvancedProtectionStatusManager::StatusChangedObserver> - obs_{this}; }; // Factory boilerplate for creating the `HttpsFirstModeService` for each browser diff --git a/chrome/browser/ssl/sct_reporting_service_factory.cc b/chrome/browser/ssl/sct_reporting_service_factory.cc --- a/chrome/browser/ssl/sct_reporting_service_factory.cc +++ b/chrome/browser/ssl/sct_reporting_service_factory.cc @@ -7,7 +7,6 @@ #include "base/functional/callback_helpers.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/ssl/sct_reporting_service.h" // static @@ -31,15 +30,7 @@ SCTReportingServiceFactory::~SCTReportingServiceFactory() = default; KeyedService* SCTReportingServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { - safe_browsing::SafeBrowsingService* safe_browsing_service = - g_browser_process->safe_browsing_service(); - // In unit tests the safe browsing service can be null, if this happens, - // return null instead of crashing. - if (!safe_browsing_service) - return nullptr; - - return new SCTReportingService(safe_browsing_service, - static_cast(profile)); + return nullptr; } // Force this to be created during BrowserContext creation, since we can't diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ssl/security_state_tab_helper.cc --- a/chrome/browser/ssl/security_state_tab_helper.cc +++ b/chrome/browser/ssl/security_state_tab_helper.cc @@ -86,13 +86,8 @@ SecurityStateTabHelper::GetVisibleSecurityState() { // information is still being initialized, thus no need to check for that. state->malicious_content_status = GetMaliciousContentStatus(); - SafetyTipWebContentsObserver* safety_tip_web_contents_observer = - SafetyTipWebContentsObserver::FromWebContents(web_contents()); state->safety_tip_info = - safety_tip_web_contents_observer - ? safety_tip_web_contents_observer - ->GetSafetyTipInfoForVisibleNavigation() - : security_state::SafetyTipInfo( + security_state::SafetyTipInfo( {security_state::SafetyTipStatus::kUnknown, GURL()}); // If both the mixed form warnings are not disabled by policy we don't degrade @@ -174,6 +169,7 @@ bool SecurityStateTabHelper::UsedPolicyInstalledCertificate() const { security_state::MaliciousContentStatus SecurityStateTabHelper::GetMaliciousContentStatus() const { +#if defined(FULL_SAFE_BROWSING) content::NavigationEntry* entry = web_contents()->GetController().GetVisibleEntry(); if (!entry) @@ -260,6 +256,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const { break; } } +#endif return security_state::MALICIOUS_CONTENT_STATUS_NONE; } diff --git a/chrome/browser/subresource_filter/chrome_content_subresource_filter_web_contents_helper_factory.cc b/chrome/browser/subresource_filter/chrome_content_subresource_filter_web_contents_helper_factory.cc --- a/chrome/browser/subresource_filter/chrome_content_subresource_filter_web_contents_helper_factory.cc +++ b/chrome/browser/subresource_filter/chrome_content_subresource_filter_web_contents_helper_factory.cc @@ -18,10 +18,14 @@ namespace { // available. Otherwise returns nullptr. const scoped_refptr GetDatabaseManagerFromSafeBrowsingService() { +#if defined(FULL_SAFE_BROWSING) safe_browsing::SafeBrowsingService* safe_browsing_service = g_browser_process->safe_browsing_service(); return safe_browsing_service ? safe_browsing_service->database_manager() : nullptr; +#else + return nullptr; +#endif } } // namespace 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 @@ -558,7 +558,6 @@ static_library("ui") { "//components/renderer_context_menu", "//components/resources", "//components/safe_browsing/content/browser", - "//components/safe_browsing/content/browser:client_side_detection", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/core/browser/db:database_manager", @@ -4540,7 +4539,6 @@ static_library("ui") { "views/download/bubble/download_dialog_view.h", "views/download/bubble/download_toolbar_button_view.cc", "views/download/bubble/download_toolbar_button_view.h", - "views/download/download_danger_prompt_views.cc", "views/download/download_in_progress_dialog_view.cc", "views/download/download_in_progress_dialog_view.h", "views/download/download_item_view.cc", diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd @@ -411,9 +411,6 @@ CHAR_LIMIT guidelines: Help improve Chrome\u2019s features and performance - - Automatically sends usage statistics and crash reports to Google - @@ -4942,9 +4939,6 @@ To change this setting, <resetlink>reset sync

- - Show your Chrome activity in Digital Wellbeing? - You can see sites you visit in Chrome and set timers for them.\n\nGoogle gets info about the sites you set timers for and how long you visit them. This info is used to make Digital Wellbeing better. diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc @@ -37,7 +37,6 @@ #include "chrome/browser/history_clusters/history_clusters_tab_helper.h" #include "chrome/browser/image_fetcher/image_fetcher_service_factory.h" #include "chrome/browser/login_detection/login_detection_tab_helper.h" -#include "chrome/browser/lookalikes/safety_tip_web_contents_observer.h" #include "chrome/browser/media/history/media_history_contents_observer.h" #include "chrome/browser/media/media_engagement_service.h" #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_observer.h" @@ -62,12 +61,14 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_key.h" #include "chrome/browser/resource_coordinator/tab_helper.h" +#if defined(FULL_SAFE_BROWSING) #include "chrome/browser/safe_browsing/chrome_safe_browsing_tab_observer_delegate.h" #include "chrome/browser/safe_browsing/safe_browsing_navigation_observer_manager_factory.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/safe_browsing/tailored_security/tailored_security_service_factory.h" #include "chrome/browser/safe_browsing/tailored_security/tailored_security_url_observer.h" #include "chrome/browser/safe_browsing/trigger_creator.h" +#endif #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/sessions/session_tab_helper_factory.h" #include "chrome/browser/ssl/chrome_security_blocking_page_factory.h" @@ -132,9 +133,11 @@ #include "components/permissions/permission_recovery_success_rate_tracker.h" #include "components/permissions/permission_request_manager.h" #include "components/permissions/unused_site_permissions_service.h" +#if defined(FULL_SAFE_BROWSING) #include "components/safe_browsing/content/browser/safe_browsing_navigation_observer.h" #include "components/safe_browsing/content/browser/safe_browsing_tab_observer.h" #include "components/safe_browsing/core/common/features.h" +#endif #include "components/search/ntp_features.h" #include "components/site_engagement/content/site_engagement_helper.h" #include "components/site_engagement/content/site_engagement_service.h" @@ -405,6 +408,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { // See https://crbug.com/910288. resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents( web_contents); +#if defined(FULL_SAFE_BROWSING) safe_browsing::SafeBrowsingNavigationObserver::MaybeCreateForWebContents( web_contents, HostContentSettingsMapFactory::GetForProfile(profile), safe_browsing::SafeBrowsingNavigationObserverManagerFactory:: @@ -422,6 +426,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { safe_browsing::TriggerCreator::MaybeCreateTriggersForWebContents( profile, web_contents); SafetyTipWebContentsObserver::CreateForWebContents(web_contents); +#endif SearchEngineTabHelper::CreateForWebContents(web_contents); SecurityStateTabHelper::CreateForWebContents(web_contents); if (site_engagement::SiteEngagementService::IsEnabled()) { diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc @@ -278,6 +278,7 @@ CreateHttpsOnlyModePage(content::WebContents* web_contents) { request_url)); } +#if 0 std::unique_ptr CreateSafeBrowsingBlockingPage(content::WebContents* web_contents) { safe_browsing::SBThreatType threat_type = @@ -336,7 +337,9 @@ CreateSafeBrowsingBlockingPage(content::WebContents* web_contents) { ui_manager->blocking_page_factory()->CreateSafeBrowsingPage( ui_manager, web_contents, main_frame_url, {resource}, true)); } +#endif +#if 0 std::unique_ptr CreateEnterpriseBlockPage( content::WebContents* web_contents) { const GURL kRequestUrl("https://enterprise-block.example.net"); @@ -427,6 +430,7 @@ CreateSafeBrowsingQuietBlockingPage(content::WebContents* web_contents) { g_browser_process->safe_browsing_service()->ui_manager().get(), web_contents, main_frame_url, resource, is_giant_webview)); } +#endif #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) std::unique_ptr CreateCaptivePortalBlockingPage( @@ -534,12 +538,6 @@ void InterstitialHTMLSource::StartDataRequest( interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents); } else if (path_without_query == "/blocked-interception") { interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents); - } else if (path_without_query == "/safebrowsing") { - interstitial_delegate = CreateSafeBrowsingBlockingPage(web_contents); - } else if (path_without_query == "/enterprise-block") { - interstitial_delegate = CreateEnterpriseBlockPage(web_contents); - } else if (path_without_query == "/enterprise-warn") { - interstitial_delegate = CreateEnterpriseWarnPage(web_contents); } else if (path_without_query == "/clock") { interstitial_delegate = CreateBadClockBlockingPage(web_contents); } else if (path_without_query == "/lookalike") { @@ -552,13 +550,7 @@ void InterstitialHTMLSource::StartDataRequest( interstitial_delegate = CreateInsecureFormPage(web_contents); } else if (path_without_query == "/https_only") { interstitial_delegate = CreateHttpsOnlyModePage(web_contents); - } - if (path_without_query == "/quietsafebrowsing") { - std::unique_ptr blocking_page = - CreateSafeBrowsingQuietBlockingPage(web_contents); - html = blocking_page->GetHTML(); - interstitial_delegate = std::move(blocking_page); #if BUILDFLAG(ENABLE_SUPERVISED_USERS) } else if (path_without_query == "/supervised_user") { html = GetSupervisedUserInterstitialHTML(path); diff --git a/chrome/common/safe_browsing/BUILD.gn b/chrome/common/safe_browsing/BUILD.gn --- a/chrome/common/safe_browsing/BUILD.gn +++ b/chrome/common/safe_browsing/BUILD.gn @@ -21,7 +21,6 @@ if (safe_browsing_mode == 1) { ":download_type_util", "//base", "//base:i18n", - "//components/safe_browsing/content/common:file_type_policies", "//crypto", ] if (is_mac) { @@ -52,7 +51,6 @@ if (safe_browsing_mode == 1) { ] deps = [ "//base", - "//components/safe_browsing/content/common:file_type_policies", "//components/safe_browsing/core/common", ] public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ] @@ -69,7 +67,6 @@ if (safe_browsing_mode == 1) { ":download_type_util", "//base", "//base:i18n", - "//components/safe_browsing/content/common:file_type_policies", "//components/safe_browsing/core/common", "//third_party/unrar:unrar", ] @@ -151,10 +148,6 @@ if (safe_browsing_mode == 1) { source_set("safe_browsing") { deps = [] - if (safe_browsing_mode != 0) { - deps += [ "//components/safe_browsing/content/common:file_type_policies" ] - } - if (safe_browsing_mode == 1) { sources = [ "ipc_protobuf_message_macros.h", diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn @@ -297,11 +297,6 @@ static_library("renderer") { ] } - if (safe_browsing_mode != 0) { - deps += - [ "//components/safe_browsing/content/renderer/phishing_classifier" ] - } - if (enable_feed_v2) { deps += [ "//components/feed/content/renderer:feed_renderer" ] } diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -97,7 +97,9 @@ #include "components/paint_preview/buildflags/buildflags.h" #include "components/password_manager/core/common/password_manager_features.h" #include "components/safe_browsing/buildflags.h" +#if defined(FULL_SAFE_BROWSING) #include "components/safe_browsing/content/renderer/threat_dom_details.h" +#endif #include "components/spellcheck/spellcheck_buildflags.h" #include "components/subresource_filter/content/renderer/subresource_filter_agent.h" #include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h" @@ -433,12 +435,8 @@ void ChromeContentRendererClient::RenderThreadStarted() { subresource_filter_ruleset_dealer_ = std::make_unique(); - phishing_model_setter_ = - std::make_unique(); - thread->AddObserver(chrome_observer_.get()); thread->AddObserver(subresource_filter_ruleset_dealer_.get()); - thread->AddObserver(phishing_model_setter_.get()); blink::WebScriptController::RegisterExtension( extensions_v8::LoadTimesExtension::Get()); diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h @@ -20,7 +20,6 @@ #include "chrome/common/media/webrtc_logging.mojom.h" #include "chrome/services/speech/buildflags/buildflags.h" #include "components/nacl/common/buildflags.h" -#include "components/safe_browsing/content/renderer/phishing_classifier/phishing_model_setter_impl.h" #include "components/spellcheck/spellcheck_buildflags.h" #include "content/public/renderer/content_renderer_client.h" #include "content/public/renderer/render_thread.h" @@ -278,8 +277,6 @@ class ChromeContentRendererClient #if BUILDFLAG(ENABLE_PLUGINS) std::set allowed_camera_device_origins_; #endif - std::unique_ptr - phishing_model_setter_; scoped_refptr browser_interface_broker_; diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -1006,7 +1006,6 @@ if (is_android) { "//components/password_manager/content/browser:browser", "//components/policy:chrome_settings_proto_generated_compile", "//components/policy/core/browser:test_support", - "//components/safe_browsing/content/browser:client_side_detection", "//components/safe_browsing/content/common:interfaces", "//components/safe_browsing/content/renderer/phishing_classifier:phishing_classifier", "//components/safe_browsing/core/common/fbs:client_model", @@ -1322,8 +1321,6 @@ if (!is_android) { "//chrome/browser/profiling_host:profiling_browsertests", "//chrome/browser/resource_coordinator:mojo_bindings", "//chrome/browser/resource_coordinator:tab_manager_features", - "//chrome/browser/safe_browsing:advanced_protection", - "//chrome/browser/safe_browsing:verdict_cache_manager_factory", "//chrome/browser/segmentation_platform:test_utils", "//chrome/browser/sharing/proto", "//chrome/browser/storage_access_api:permissions", @@ -1466,7 +1463,6 @@ if (!is_android) { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", - "//components/safe_browsing/content/browser:client_side_detection", "//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/password_protection:test_support", @@ -6082,7 +6078,6 @@ test("unit_tests") { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", - "//components/safe_browsing/content/browser:client_side_detection", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/password_protection:mock_password_protection", "//components/safe_browsing/content/browser/web_ui", diff --git a/components/BUILD.gn b/components/BUILD.gn --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -655,7 +655,6 @@ test("components_unittests") { if (safe_browsing_mode == 1) { deps += [ "//components/safe_browsing/content/browser:unit_tests", - "//components/safe_browsing/content/renderer/phishing_classifier:unit_tests", ] } else if (safe_browsing_mode == 2) { deps += [ "//components/safe_browsing/content/browser:unit_tests" ] diff --git a/components/component_updater/installer_policies/BUILD.gn b/components/component_updater/installer_policies/BUILD.gn --- a/components/component_updater/installer_policies/BUILD.gn +++ b/components/component_updater/installer_policies/BUILD.gn @@ -20,8 +20,6 @@ static_library("installer_policies_no_content_deps") { "client_side_phishing_component_installer_policy.h", "origin_trials_component_installer.cc", "origin_trials_component_installer.h", - "safety_tips_component_installer.cc", - "safety_tips_component_installer.h", "trust_token_key_commitments_component_installer_policy.cc", "trust_token_key_commitments_component_installer_policy.h", ] diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc --- a/components/permissions/permission_request_manager.cc +++ b/components/permissions/permission_request_manager.cc @@ -706,10 +706,7 @@ PermissionRequestManager::PermissionRequestManager( view_factory_(base::BindRepeating(&PermissionPrompt::Create)), tab_is_hidden_(web_contents->GetVisibility() == content::Visibility::HIDDEN), - auto_response_for_test_(NONE), - permission_ui_selectors_( - PermissionsClient::Get()->CreatePermissionUiSelectors( - web_contents->GetBrowserContext())) {} + auto_response_for_test_(NONE) {} void PermissionRequestManager::DequeueRequestIfNeeded() { // TODO(olesiamarukhno): Media requests block other media requests from diff --git a/components/safe_browsing/content/browser/BUILD.gn b/components/safe_browsing/content/browser/BUILD.gn --- a/components/safe_browsing/content/browser/BUILD.gn +++ b/components/safe_browsing/content/browser/BUILD.gn @@ -149,7 +149,6 @@ source_set("unit_tests") { ] deps = [ - ":client_side_detection", "//base:base", "//base/test:test_support", "//components/optimization_guide/core:model_executor", diff --git a/components/safe_browsing/content/common/file_type_policies.cc b/components/safe_browsing/content/common/file_type_policies.cc --- a/components/safe_browsing/content/common/file_type_policies.cc +++ b/components/safe_browsing/content/common/file_type_policies.cc @@ -87,8 +87,7 @@ FileTypePolicies::~FileTypePolicies() { } std::string FileTypePolicies::ReadResourceBundle() { - ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); - return bundle.LoadDataResourceString(IDR_DOWNLOAD_FILE_TYPES_PB); + return nullptr; } void FileTypePolicies::RecordUpdateMetrics(UpdateResult result, diff --git a/components/safe_browsing/core/common/features.cc b/components/safe_browsing/core/common/features.cc --- a/components/safe_browsing/core/common/features.cc +++ b/components/safe_browsing/core/common/features.cc @@ -224,8 +224,8 @@ constexpr base::FeatureParam kStrictDownloadTimeoutMilliseconds{ /*default_value=*/7000}; BASE_FEATURE(kSuspiciousSiteTriggerQuotaFeature, - "SafeBrowsingSuspiciousSiteTriggerQuota", - base::FEATURE_ENABLED_BY_DEFAULT); + "SafeBrowsingSuspiciousSiteTriggerQuota", // disabled by default + base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite BASE_FEATURE(kTailoredSecurityDesktopNotice, "TailoredSecurityDesktopNotice", diff --git a/components/security_interstitials/content/captive_portal_blocking_page.cc b/components/security_interstitials/content/captive_portal_blocking_page.cc --- a/components/security_interstitials/content/captive_portal_blocking_page.cc +++ b/components/security_interstitials/content/captive_portal_blocking_page.cc @@ -15,6 +15,7 @@ #include "build/build_config.h" #include "components/captive_portal/core/captive_portal_detector.h" #include "components/captive_portal/core/captive_portal_metrics.h" +#include "components/safe_browsing/buildflags.h" #include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/security_interstitials/content/cert_report_helper.h" #include "components/security_interstitials/content/security_interstitial_controller_client.h" @@ -192,6 +193,7 @@ void CaptivePortalBlockingPage::PopulateInterstitialStrings( load_time_data.Set("recurrentErrorParagraph", ""); load_time_data.Set("show_recurrent_error_paragraph", false); +#if BUILDFLAG(FULL_SAFE_BROWSING) if (cert_report_helper()) { cert_report_helper()->PopulateExtendedReportingOption(load_time_data); cert_report_helper()->PopulateEnhancedProtectionMessage(load_time_data); @@ -200,6 +202,11 @@ void CaptivePortalBlockingPage::PopulateInterstitialStrings( load_time_data.Set( security_interstitials::kDisplayEnhancedProtectionMessage, false); } +#else + load_time_data.Set(security_interstitials::kDisplayCheckBox, false); + load_time_data.Set( + security_interstitials::kDisplayEnhancedProtectionMessage, false); +#endif } void CaptivePortalBlockingPage::CommandReceived(const std::string& command) { @@ -214,8 +221,6 @@ void CaptivePortalBlockingPage::CommandReceived(const std::string& command) { security_interstitials::SecurityInterstitialCommand cmd = static_cast( command_num); - cert_report_helper()->HandleReportingCommands(cmd, - controller()->GetPrefService()); switch (cmd) { case security_interstitials::CMD_OPEN_LOGIN: captive_portal::CaptivePortalMetrics::LogCaptivePortalBlockingPageEvent( diff --git a/components/security_interstitials/content/cert_report_helper.cc b/components/security_interstitials/content/cert_report_helper.cc --- a/components/security_interstitials/content/cert_report_helper.cc +++ b/components/security_interstitials/content/cert_report_helper.cc @@ -62,8 +62,7 @@ CertReportHelper::CertReportHelper( interstitial_reason_(interstitial_reason), overridable_(overridable), interstitial_time_(interstitial_time), - can_show_enhanced_protection_message_( - can_show_enhanced_protection_message), + can_show_enhanced_protection_message_(false), // always disabled in Bromite metrics_helper_(metrics_helper) {} CertReportHelper::~CertReportHelper() = default; @@ -176,8 +175,6 @@ void CertReportHelper::FinishCertCollection() { LOG(ERROR) << "Failed to serialize certificate report."; return; } - - ssl_cert_reporter_->ReportInvalidCertificateChain(serialized_report); } bool CertReportHelper::ShouldShowCertificateReporterCheckbox() { diff --git a/components/unified_consent/unified_consent_service.cc b/components/unified_consent/unified_consent_service.cc --- a/components/unified_consent/unified_consent_service.cc +++ b/components/unified_consent/unified_consent_service.cc @@ -56,7 +56,7 @@ void UnifiedConsentService::SetUrlKeyedAnonymizedDataCollectionEnabled( SetMigrationState(MigrationState::kCompleted); pref_service_->SetBoolean(prefs::kUrlKeyedAnonymizedDataCollectionEnabled, - enabled); + false); } void UnifiedConsentService::Shutdown() { diff --git a/content/browser/file_system_access/file_system_access_file_writer_impl.cc b/content/browser/file_system_access/file_system_access_file_writer_impl.cc --- a/content/browser/file_system_access/file_system_access_file_writer_impl.cc +++ b/content/browser/file_system_access/file_system_access_file_writer_impl.cc @@ -44,7 +44,6 @@ FileSystemAccessFileWriterImpl::FileSystemAccessFileWriterImpl( lock_(std::move(lock)), quarantine_connection_callback_( std::move(quarantine_connection_callback)), - has_transient_user_activation_(has_transient_user_activation), auto_close_(auto_close) { DCHECK_EQ(swap_url.type(), url.type()); DCHECK_EQ(lock_->type(), @@ -253,7 +252,7 @@ void FileSystemAccessFileWriterImpl::CloseImpl(CloseCallback callback) { FileSystemOperation::CopyOrMoveOption:: kPreserveDestinationPermissions), std::move(quarantine_connection_callback_), - has_transient_user_activation_); + false); // Allows the unique pointer to be bound to the callback so the helper stays // alive until the operation completes. FileSystemAccessSafeMoveHelper* raw_helper = diff --git a/content/browser/file_system_access/file_system_access_file_writer_impl.h b/content/browser/file_system_access/file_system_access_file_writer_impl.h --- a/content/browser/file_system_access/file_system_access_file_writer_impl.h +++ b/content/browser/file_system_access/file_system_access_file_writer_impl.h @@ -123,11 +123,6 @@ class CONTENT_EXPORT FileSystemAccessFileWriterImpl download::QuarantineConnectionCallback quarantine_connection_callback_ GUARDED_BY_CONTEXT(sequence_checker_); - // Keeps track of user activation state at creation time for after write - // checks. - bool has_transient_user_activation_ GUARDED_BY_CONTEXT(sequence_checker_) = - false; - // Changes will be written to the target file even if the stream isn't // explicitly closed. bool auto_close_ GUARDED_BY_CONTEXT(sequence_checker_) = false; diff --git a/content/browser/file_system_access/file_system_access_safe_move_helper.cc b/content/browser/file_system_access/file_system_access_safe_move_helper.cc --- a/content/browser/file_system_access/file_system_access_safe_move_helper.cc +++ b/content/browser/file_system_access/file_system_access_safe_move_helper.cc @@ -152,8 +152,7 @@ FileSystemAccessSafeMoveHelper::FileSystemAccessSafeMoveHelper( dest_url_(dest_url), options_(options), quarantine_connection_callback_( - std::move(quarantine_connection_callback)), - has_transient_user_activation_(has_transient_user_activation) {} + std::move(quarantine_connection_callback)) {} FileSystemAccessSafeMoveHelper::~FileSystemAccessSafeMoveHelper() = default; @@ -168,15 +167,8 @@ void FileSystemAccessSafeMoveHelper::Start( return; } - if (!RequireAfterWriteChecks() || !manager_->permission_context()) { DidAfterWriteCheck( FileSystemAccessPermissionContext::AfterWriteCheckResult::kAllow); - return; - } - - ComputeHashForSourceFile( - base::BindOnce(&FileSystemAccessSafeMoveHelper::DoAfterWriteCheck, - weak_factory_.GetWeakPtr())); } void FileSystemAccessSafeMoveHelper::ComputeHashForSourceFile( @@ -198,6 +190,7 @@ void FileSystemAccessSafeMoveHelper::ComputeHashForSourceFile( } bool FileSystemAccessSafeMoveHelper::RequireAfterWriteChecks() const { + if ((true)) return false; if (dest_url().type() == storage::kFileSystemTypeTemporary) return false; @@ -221,7 +214,7 @@ bool FileSystemAccessSafeMoveHelper::RequireQuarantine() const { return dest_url().type() != storage::kFileSystemTypeTemporary; } -void FileSystemAccessSafeMoveHelper::DoAfterWriteCheck( +/*void FileSystemAccessSafeMoveHelper::DoAfterWriteCheck( base::File::Error hash_result, const std::string& hash, int64_t size) { @@ -258,7 +251,7 @@ void FileSystemAccessSafeMoveHelper::DoAfterWriteCheck( std::move(item), context_.frame_id, base::BindOnce(&FileSystemAccessSafeMoveHelper::DidAfterWriteCheck, weak_factory_.GetWeakPtr())); -} +}*/ void FileSystemAccessSafeMoveHelper::DidAfterWriteCheck( FileSystemAccessPermissionContext::AfterWriteCheckResult result) { diff --git a/content/browser/file_system_access/file_system_access_safe_move_helper.h b/content/browser/file_system_access/file_system_access_safe_move_helper.h --- a/content/browser/file_system_access/file_system_access_safe_move_helper.h +++ b/content/browser/file_system_access/file_system_access_safe_move_helper.h @@ -60,9 +60,6 @@ class CONTENT_EXPORT FileSystemAccessSafeMoveHelper { private: SEQUENCE_CHECKER(sequence_checker_); - void DoAfterWriteCheck(base::File::Error hash_result, - const std::string& hash, - int64_t size); void DidAfterWriteCheck( FileSystemAccessPermissionContext::AfterWriteCheckResult result); void DidFileSkipQuarantine(base::File::Error result); @@ -98,9 +95,6 @@ class CONTENT_EXPORT FileSystemAccessSafeMoveHelper { download::QuarantineConnectionCallback quarantine_connection_callback_ GUARDED_BY_CONTEXT(sequence_checker_); - bool has_transient_user_activation_ GUARDED_BY_CONTEXT(sequence_checker_) = - false; - FileSystemAccessSafeMoveHelperCallback callback_ GUARDED_BY_CONTEXT(sequence_checker_); diff --git a/content/public/browser/file_system_access_permission_context.h b/content/public/browser/file_system_access_permission_context.h --- a/content/public/browser/file_system_access_permission_context.h +++ b/content/public/browser/file_system_access_permission_context.h @@ -116,12 +116,6 @@ class FileSystemAccessPermissionContext { base::OnceCallback callback) = 0; enum class AfterWriteCheckResult { kAllow, kBlock }; - // Runs a recently finished write operation through checks such as malware - // or other security checks to determine if the write should be allowed. - virtual void PerformAfterWriteChecks( - std::unique_ptr item, - GlobalRenderFrameHostId frame_id, - base::OnceCallback callback) = 0; // Returns whether the give |origin| already allows read permission, or it is // possible to request one. This is used to block file dialogs from being diff --git a/weblayer/BUILD.gn b/weblayer/BUILD.gn --- a/weblayer/BUILD.gn +++ b/weblayer/BUILD.gn @@ -470,11 +470,9 @@ source_set("weblayer_lib_base") { "//components/profile_metrics", "//components/reduce_accept_language/browser", "//components/safe_browsing/content/browser", - "//components/safe_browsing/content/browser:client_side_detection", "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/content/common:interfaces", "//components/safe_browsing/content/renderer:throttles", - "//components/safe_browsing/content/renderer/phishing_classifier", "//components/safe_browsing/core/browser:safe_browsing_metrics_collector", "//components/safe_browsing/core/browser/db:database_manager", "//components/safe_browsing/core/common", @@ -609,8 +607,6 @@ source_set("weblayer_lib_base") { "browser/bluetooth/weblayer_bluetooth_scanning_prompt_android_delegate.h", "browser/browser_list_proxy.cc", "browser/browser_list_proxy.h", - "browser/component_updater/client_side_phishing_component_loader_policy.cc", - "browser/component_updater/client_side_phishing_component_loader_policy.h", "browser/component_updater/registration.cc", "browser/component_updater/registration.h", "browser/content_view_render_view.cc", diff --git a/weblayer/test/BUILD.gn b/weblayer/test/BUILD.gn --- a/weblayer/test/BUILD.gn +++ b/weblayer/test/BUILD.gn @@ -244,7 +244,6 @@ test("weblayer_browsertests") { "//components/page_info/android", "//components/safe_browsing/android:safe_browsing_api_handler", "//components/safe_browsing/content/browser", - "//components/safe_browsing/content/browser:client_side_detection", "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/content/common:interfaces", "//components/safe_browsing/core/browser:token_fetcher", -- 2.25.1