|
1 | 1 | --- a/chrome/browser/BUILD.gn
|
2 | 2 | +++ b/chrome/browser/BUILD.gn
|
3 |
| -@@ -2251,7 +2251,6 @@ static_library("browser") { |
| 3 | +@@ -2249,7 +2249,6 @@ static_library("browser") { |
4 | 4 | "//components/reporting/util:task_runner_context",
|
5 | 5 | "//components/resources",
|
6 | 6 | "//components/safe_browsing/content/browser",
|
7 | 7 | - "//components/safe_browsing/content/browser:client_side_detection",
|
8 | 8 | "//components/safe_browsing/content/browser:safe_browsing_service",
|
9 | 9 | "//components/safe_browsing/content/browser/password_protection",
|
10 | 10 | "//components/safe_browsing/content/browser/web_ui",
|
11 |
| -@@ -3636,8 +3635,6 @@ static_library("browser") { |
12 |
| - "download/download_commands.h", |
| 11 | +@@ -3641,8 +3640,6 @@ static_library("browser") { |
| 12 | + "download/download_commands.cc", |
13 | 13 | "download/download_crx_util.cc",
|
14 | 14 | "download/download_crx_util.h",
|
15 | 15 | - "download/download_danger_prompt.cc",
|
|
50 | 50 | #include "chrome/browser/shell_integration.h"
|
51 | 51 | #include "chrome/browser/site_isolation/prefs_observer.h"
|
52 | 52 | #include "chrome/browser/ssl/secure_origin_prefs_observer.h"
|
53 |
| -@@ -478,8 +477,6 @@ void BrowserProcessImpl::StartTearDown() |
| 53 | +@@ -479,8 +478,6 @@ void BrowserProcessImpl::StartTearDown() |
54 | 54 | #endif
|
55 | 55 | metrics_services_manager_.reset();
|
56 | 56 | intranet_redirect_detector_.reset();
|
|
59 | 59 | network_time_tracker_.reset();
|
60 | 60 |
|
61 | 61 | #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
|
62 |
| -@@ -1166,14 +1163,6 @@ StatusTray* BrowserProcessImpl::status_t |
| 62 | +@@ -1167,14 +1164,6 @@ StatusTray* BrowserProcessImpl::status_t |
63 | 63 | return status_tray_.get();
|
64 | 64 | }
|
65 | 65 |
|
|
74 | 74 | subresource_filter::RulesetService*
|
75 | 75 | BrowserProcessImpl::subresource_filter_ruleset_service() {
|
76 | 76 | DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
77 |
| -@@ -1485,26 +1474,6 @@ void BrowserProcessImpl::CreateBackgroun |
| 77 | +@@ -1479,26 +1468,6 @@ void BrowserProcessImpl::CreateBackgroun |
78 | 78 | #endif
|
79 | 79 | }
|
80 | 80 |
|
|
129 | 129 | #include "chrome/browser/reading_list/reading_list_model_factory.h"
|
130 | 130 | -#include "chrome/browser/safe_browsing/safe_browsing_service.h"
|
131 | 131 | #include "chrome/browser/safe_browsing/verdict_cache_manager_factory.h"
|
| 132 | + #include "chrome/browser/search_engine_choice/search_engine_choice_service_factory.h" |
132 | 133 | #include "chrome/browser/search_engines/template_url_service_factory.h"
|
133 |
| - #include "chrome/browser/share/share_history.h" |
134 |
| -@@ -645,10 +644,6 @@ void ChromeBrowsingDataRemoverDelegate:: |
| 134 | +@@ -647,10 +646,6 @@ void ChromeBrowsingDataRemoverDelegate:: |
135 | 135 | base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
|
136 | 136 |
|
137 | 137 | network::mojom::NetworkContext* safe_browsing_context = nullptr;
|
|
144 | 144 | browsing_data::RemoveFederatedSiteSettingsData(delete_begin_, delete_end_,
|
145 | 145 | --- a/chrome/browser/chrome_content_browser_client.cc
|
146 | 146 | +++ b/chrome/browser/chrome_content_browser_client.cc
|
147 |
| -@@ -5512,10 +5512,6 @@ ChromeContentBrowserClient::CreateThrott |
| 147 | +@@ -5513,10 +5513,6 @@ ChromeContentBrowserClient::CreateThrott |
148 | 148 | throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
|
149 | 149 | handle, handle->GetWebContents()->GetBrowserContext()));
|
150 | 150 |
|
|
155 | 155 | throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
|
156 | 156 | handle,
|
157 | 157 | base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
|
158 |
| -@@ -5567,16 +5563,6 @@ ChromeContentBrowserClient::CreateThrott |
| 158 | +@@ -5571,16 +5567,6 @@ ChromeContentBrowserClient::CreateThrott |
159 | 159 | &throttles);
|
160 | 160 | #endif
|
161 | 161 |
|
|
172 | 172 | if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) {
|
173 | 173 | throttles.push_back(
|
174 | 174 | std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
|
175 |
| -@@ -5897,8 +5883,6 @@ bool ChromeContentBrowserClient::IsPlugi |
| 175 | +@@ -5901,8 +5887,6 @@ bool ChromeContentBrowserClient::IsPlugi |
176 | 176 | void ChromeContentBrowserClient::InitOnUIThread() {
|
177 | 177 | DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
178 | 178 |
|
|
207 | 207 | } // namespace
|
208 | 208 | --- a/chrome/browser/download/chrome_download_manager_delegate.cc
|
209 | 209 | +++ b/chrome/browser/download/chrome_download_manager_delegate.cc
|
210 |
| -@@ -533,13 +533,6 @@ void ChromeDownloadManagerDelegate::SetD |
| 210 | +@@ -534,13 +534,6 @@ void ChromeDownloadManagerDelegate::SetD |
211 | 211 |
|
212 | 212 | download_manager_ = dm;
|
213 | 213 |
|
|
221 | 221 | if (download_manager_) {
|
222 | 222 | download_manager_->AddObserver(this);
|
223 | 223 | }
|
224 |
| -@@ -1007,17 +1000,6 @@ void ChromeDownloadManagerDelegate::Choo |
| 224 | +@@ -1062,17 +1055,6 @@ void ChromeDownloadManagerDelegate::Choo |
225 | 225 | void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
|
226 | 226 | base::FilePath* filename,
|
227 | 227 | const GURL& source_url) {
|
|
250 | 250 |
|
251 | 251 | // Whether the download is currently being revived.
|
252 | 252 | bool is_being_revived_ = false;
|
253 |
| -@@ -531,13 +531,13 @@ void DownloadItemModel::SetShouldPreferO |
| 253 | +@@ -501,13 +501,13 @@ void DownloadItemModel::SetShouldPreferO |
254 | 254 | data->should_prefer_opening_in_browser_ = preference;
|
255 | 255 | }
|
256 | 256 |
|
|
267 | 267 | DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
|
268 | 268 | data->danger_level_ = danger_level;
|
269 | 269 | }
|
270 |
| -@@ -740,9 +740,6 @@ bool DownloadItemModel::IsCommandEnabled |
| 270 | +@@ -710,9 +710,6 @@ bool DownloadItemModel::IsCommandEnabled |
271 | 271 | // filename. Don't base an "Always open" decision based on it. Also
|
272 | 272 | // exclude extensions.
|
273 | 273 | return download_->CanOpenDownload() &&
|
|
500 | 500 | referrer_entries)));
|
501 | 501 | --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
|
502 | 502 | +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
|
503 |
| -@@ -710,18 +710,6 @@ void WebstorePrivateBeginInstallWithMani |
| 503 | +@@ -709,18 +709,6 @@ void WebstorePrivateBeginInstallWithMani |
504 | 504 |
|
505 | 505 | void WebstorePrivateBeginInstallWithManifest3Function::
|
506 | 506 | ReportFrictionAcceptedEvent() {
|
|
519 | 519 | }
|
520 | 520 |
|
521 | 521 | void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
|
522 |
| -@@ -1226,54 +1214,9 @@ WebstorePrivateGetReferrerChainFunction: |
| 522 | +@@ -1204,54 +1192,9 @@ WebstorePrivateGetReferrerChainFunction: |
523 | 523 |
|
524 | 524 | ExtensionFunction::ResponseAction
|
525 | 525 | WebstorePrivateGetReferrerChainFunction::Run() {
|
|
648 | 648 | // SimpleURLLoader -> (owned loader, extension id).
|
649 | 649 | --- a/chrome/browser/profiles/profile_impl.cc
|
650 | 650 | +++ b/chrome/browser/profiles/profile_impl.cc
|
651 |
| -@@ -91,7 +91,6 @@ |
652 |
| - #include "chrome/browser/push_messaging/push_messaging_service_factory.h" |
| 651 | +@@ -95,7 +95,6 @@ |
653 | 652 | #include "chrome/browser/push_messaging/push_messaging_service_impl.h"
|
| 653 | + #include "chrome/browser/reading_list/reading_list_model_factory.h" |
654 | 654 | #include "chrome/browser/reduce_accept_language/reduce_accept_language_factory.h"
|
655 | 655 | -#include "chrome/browser/safe_browsing/safe_browsing_service.h"
|
656 | 656 | #include "chrome/browser/sessions/exit_type_service.h"
|
657 | 657 | #include "chrome/browser/sharing/sharing_service_factory.h"
|
658 | 658 | #include "chrome/browser/signin/identity_manager_factory.h"
|
659 |
| -@@ -646,17 +645,6 @@ void ProfileImpl::LoadPrefsForNormalStar |
| 659 | +@@ -616,17 +615,6 @@ void ProfileImpl::LoadPrefsForNormalStar |
660 | 660 |
|
661 | 661 | mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
|
662 | 662 | pref_validation_delegate;
|
|
672 | 672 | - }
|
673 | 673 | - }
|
674 | 674 |
|
675 |
| - prefs_ = |
676 |
| - CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false), |
| 675 | + prefs_ = CreateProfilePrefService( |
| 676 | + pref_registry_, CreateExtensionPrefStore(this, false), |
677 | 677 | --- a/chrome/browser/profiles/profiles_state.cc
|
678 | 678 | +++ b/chrome/browser/profiles/profiles_state.cc
|
679 |
| -@@ -314,9 +314,6 @@ void RemoveBrowsingDataForProfile(const |
| 679 | +@@ -290,9 +290,6 @@ void RemoveBrowsingDataForProfile(const |
680 | 680 | // The BrowsingDataRemover relies on many objects that aren't created in unit
|
681 | 681 | // tests. Previously this code would depend on content::ResourceDispatcherHost
|
682 | 682 | // but that's gone, so do a similar hack for now.
|
|
696 | 696 | sources = [
|
697 | 697 | "chrome_controller_client.cc",
|
698 | 698 | "chrome_controller_client.h",
|
699 |
| -@@ -74,6 +75,7 @@ static_library("safe_browsing") { |
| 699 | +@@ -76,6 +77,7 @@ static_library("safe_browsing") { |
700 | 700 | "//mojo/public/cpp/system",
|
701 | 701 | "//services/preferences/public/cpp",
|
702 | 702 | ]
|
703 | 703 | + }
|
704 | 704 |
|
705 | 705 | if (is_android) {
|
706 | 706 | deps += [
|
707 |
| -@@ -525,6 +527,7 @@ static_library("advanced_protection") { |
| 707 | +@@ -536,6 +538,7 @@ static_library("advanced_protection") { |
708 | 708 | }
|
709 | 709 |
|
710 | 710 | source_set("metrics_collector") {
|
711 | 711 | + if (false) {
|
712 | 712 | sources = [
|
713 | 713 | "safe_browsing_metrics_collector_factory.cc",
|
714 | 714 | "safe_browsing_metrics_collector_factory.h",
|
715 |
| -@@ -544,6 +547,7 @@ source_set("metrics_collector") { |
| 715 | +@@ -555,6 +558,7 @@ source_set("metrics_collector") { |
716 | 716 | "//components/safe_browsing/core/common:safe_browsing_prefs",
|
717 | 717 | "//content/public/browser",
|
718 | 718 | ]
|
|
818 | 818 | }
|
819 | 819 | --- a/chrome/browser/ui/BUILD.gn
|
820 | 820 | +++ b/chrome/browser/ui/BUILD.gn
|
821 |
| -@@ -4294,7 +4294,6 @@ static_library("ui") { |
| 821 | +@@ -4065,7 +4065,6 @@ static_library("ui") { |
822 | 822 | "views/download/bubble/download_dialog_view.h",
|
823 | 823 | "views/download/bubble/download_toolbar_button_view.cc",
|
824 | 824 | "views/download/bubble/download_toolbar_button_view.h",
|
|
876 | 876 | #include "chrome/browser/download/download_history.h"
|
877 | 877 | #include "chrome/browser/download/download_item_model.h"
|
878 | 878 | #include "chrome/browser/download/download_item_warning_data.h"
|
879 |
| -@@ -695,12 +694,6 @@ void DownloadsDOMHandler::RemoveDownload |
| 879 | +@@ -687,12 +686,6 @@ void DownloadsDOMHandler::RemoveDownload |
880 | 880 | IdSet ids;
|
881 | 881 |
|
882 | 882 | for (download::DownloadItem* download : to_remove) {
|
|
901 | 901 | #include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h"
|
902 | 902 | --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
|
903 | 903 | +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
|
904 |
| -@@ -281,64 +281,6 @@ CreateHttpsOnlyModePage(content::WebCont |
| 904 | +@@ -289,64 +289,6 @@ CreateHttpsOnlyModePage(content::WebCont |
905 | 905 | /*use_new_interstitial=*/IsNewHttpsFirstModeInterstitialEnabled());
|
906 | 906 | }
|
907 | 907 |
|
|
966 | 966 | std::unique_ptr<EnterpriseBlockPage> CreateEnterpriseBlockPage(
|
967 | 967 | content::WebContents* web_contents) {
|
968 | 968 | const GURL kRequestUrl("https://enterprise-block.example.net");
|
969 |
| -@@ -349,35 +291,6 @@ std::unique_ptr<EnterpriseBlockPage> Cre |
970 |
| - kRequestUrl)); |
| 969 | +@@ -367,35 +309,6 @@ std::unique_ptr<ManagedProfileRequiredPa |
| 970 | + kRequestUrl)); |
971 | 971 | }
|
972 | 972 |
|
973 | 973 | -std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWarnPage(
|
|
1000 | 1000 | -}
|
1001 | 1001 | -
|
1002 | 1002 | #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
|
1003 |
| - std::unique_ptr<SupervisedUserVerificationPage> |
1004 |
| - CreateSupervisedUserVerificationPage(content::WebContents* web_contents, |
1005 |
| -@@ -415,61 +328,6 @@ CreateSupervisedUserVerificationPageForB |
| 1003 | + std::unique_ptr<SupervisedUserVerificationPageForYouTube> |
| 1004 | + CreateSupervisedUserVerificationPageForYouTube( |
| 1005 | +@@ -432,61 +345,6 @@ CreateSupervisedUserVerificationPageForB |
1006 | 1006 | }
|
1007 | 1007 | #endif
|
1008 | 1008 |
|
|
1064 | 1064 | #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
|
1065 | 1065 | std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
|
1066 | 1066 | content::WebContents* web_contents) {
|
1067 |
| -@@ -576,12 +434,8 @@ void InterstitialHTMLSource::StartDataRe |
| 1067 | +@@ -593,12 +451,8 @@ void InterstitialHTMLSource::StartDataRe |
1068 | 1068 | interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents);
|
1069 | 1069 | } else if (path_without_query == "/blocked-interception") {
|
1070 | 1070 | interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
|
|
1077 | 1077 | } else if (path_without_query == "/clock") {
|
1078 | 1078 | interstitial_delegate = CreateBadClockBlockingPage(web_contents);
|
1079 | 1079 | } else if (path_without_query == "/lookalike") {
|
1080 |
| -@@ -611,12 +465,7 @@ void InterstitialHTMLSource::StartDataRe |
| 1080 | +@@ -630,12 +484,7 @@ void InterstitialHTMLSource::StartDataRe |
1081 | 1081 | #endif
|
1082 | 1082 | }
|
1083 | 1083 |
|
|
1093 | 1093 | html = interstitial_delegate.get()->GetHTMLContents();
|
1094 | 1094 | --- a/chrome/renderer/chrome_content_renderer_client.cc
|
1095 | 1095 | +++ b/chrome/renderer/chrome_content_renderer_client.cc
|
1096 |
| -@@ -109,7 +109,6 @@ |
| 1096 | +@@ -111,7 +111,6 @@ |
1097 | 1097 | #include "components/pdf/common/pdf_util.h"
|
1098 | 1098 | #include "components/permissions/features.h"
|
1099 | 1099 | #include "components/safe_browsing/buildflags.h"
|
1100 | 1100 | -#include "components/safe_browsing/content/renderer/threat_dom_details.h"
|
| 1101 | + #include "components/sampling_profiler/process_type.h" |
1101 | 1102 | #include "components/sampling_profiler/thread_profiler.h"
|
1102 | 1103 | #include "components/security_interstitials/content/renderer/security_interstitial_page_controller_delegate_impl.h"
|
1103 |
| - #include "components/spellcheck/spellcheck_buildflags.h" |
1104 |
| -@@ -473,12 +472,8 @@ void ChromeContentRendererClient::Render |
1105 |
| - subresource_filter_ruleset_dealer_ = |
1106 |
| - std::make_unique<subresource_filter::UnverifiedRulesetDealer>(); |
| 1104 | +@@ -483,12 +482,8 @@ void ChromeContentRendererClient::Render |
| 1105 | + thread->AddObserver(fingerprinting_protection_ruleset_dealer_.get()); |
| 1106 | + } |
1107 | 1107 |
|
1108 | 1108 | - phishing_model_setter_ =
|
1109 | 1109 | - std::make_unique<safe_browsing::PhishingModelSetterImpl>();
|
|
0 commit comments