summaryrefslogtreecommitdiff
path: root/www/chromium-uc/patches/core/ungoogled-chromium
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium-uc/patches/core/ungoogled-chromium')
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/block-requests.patch36
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch120
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/disable-crash-reporter.patch6
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/disable-domain-reliability.patch44
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/disable-floc.patch78
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch38
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/disable-gaia.patch9
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/disable-gcm.patch6
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/disable-google-host-detection.patch73
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/disable-mei-preload.patch10
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/disable-network-time-tracker.patch6
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch116
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/disable-profile-avatar-downloading.patch4
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/disable-signin.patch6
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/disable-untraceable-urls.patch51
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch10
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/disable-webstore-urls.patch93
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/doh-changes.patch76
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch16
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch215
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch16
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch1200
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch4
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch2243
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch11
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch28
26 files changed, 2233 insertions, 2282 deletions
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/block-requests.patch b/www/chromium-uc/patches/core/ungoogled-chromium/block-requests.patch
index 1e29eb6..1fb55bb 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/block-requests.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/block-requests.patch
@@ -1,7 +1,7 @@
1## Prevent request attempts 1## Prevent request attempts
2# chrome://discards/ attempts to use d3 to display the graph 2# chrome://discards/ attempts to use d3 to display the graph
3--- chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc.orig 3--- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
4+++ chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc 4+++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
5@@ -286,6 +286,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad 5@@ -286,6 +286,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
6 OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default; 6 OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default;
7 7
@@ -10,9 +10,9 @@
10 callbacks_.push_back(std::move(callback)); 10 callbacks_.push_back(std::move(callback));
11 11
12 // Note: If there is an ongoing request, abandon it. It's possible that 12 // Note: If there is an ongoing request, abandon it. It's possible that
13--- chrome/browser/new_tab_page/promos/promo_service.cc.orig 13--- a/chrome/browser/new_tab_page/promos/promo_service.cc
14+++ chrome/browser/new_tab_page/promos/promo_service.cc 14+++ b/chrome/browser/new_tab_page/promos/promo_service.cc
15@@ -138,6 +138,7 @@ PromoService::PromoService( 15@@ -139,6 +139,7 @@ PromoService::PromoService(
16 PromoService::~PromoService() = default; 16 PromoService::~PromoService() = default;
17 17
18 void PromoService::Refresh() { 18 void PromoService::Refresh() {
@@ -20,8 +20,8 @@
20 net::NetworkTrafficAnnotationTag traffic_annotation = 20 net::NetworkTrafficAnnotationTag traffic_annotation =
21 net::DefineNetworkTrafficAnnotation("promo_service", R"( 21 net::DefineNetworkTrafficAnnotation("promo_service", R"(
22 semantics { 22 semantics {
23--- chrome/browser/resources/discards/graph_doc_template.html.orig 23--- a/chrome/browser/resources/discards/graph_doc_template.html
24+++ chrome/browser/resources/discards/graph_doc_template.html 24+++ b/chrome/browser/resources/discards/graph_doc_template.html
25@@ -78,10 +78,6 @@ URL. As result, this document needs to b 25@@ -78,10 +78,6 @@ URL. As result, this document needs to b
26 } 26 }
27 27
@@ -33,9 +33,9 @@
33 <script type="application/javascript"> 33 <script type="application/javascript">
34 ${javascript_file} 34 ${javascript_file}
35 </script> 35 </script>
36--- chrome/browser/search/background/ntp_background_service.cc.orig 36--- a/chrome/browser/search/background/ntp_background_service.cc
37+++ chrome/browser/search/background/ntp_background_service.cc 37+++ b/chrome/browser/search/background/ntp_background_service.cc
38@@ -83,6 +83,7 @@ void NtpBackgroundService::Shutdown() { 38@@ -84,6 +84,7 @@ void NtpBackgroundService::Shutdown() {
39 } 39 }
40 40
41 void NtpBackgroundService::FetchCollectionInfo() { 41 void NtpBackgroundService::FetchCollectionInfo() {
@@ -43,8 +43,8 @@
43 if (collections_loader_ != nullptr) 43 if (collections_loader_ != nullptr)
44 return; 44 return;
45 collection_error_info_.ClearError(); 45 collection_error_info_.ClearError();
46--- chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc.orig 46--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
47+++ chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc 47+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
48@@ -286,6 +286,7 @@ GURL SpellcheckHunspellDictionary::GetDi 48@@ -286,6 +286,7 @@ GURL SpellcheckHunspellDictionary::GetDi
49 } 49 }
50 50
@@ -53,8 +53,8 @@
53 DCHECK_CURRENTLY_ON(BrowserThread::UI); 53 DCHECK_CURRENTLY_ON(BrowserThread::UI);
54 DCHECK(browser_context_); 54 DCHECK(browser_context_);
55 55
56--- components/assist_ranker/ranker_url_fetcher.cc.orig 56--- a/components/assist_ranker/ranker_url_fetcher.cc
57+++ components/assist_ranker/ranker_url_fetcher.cc 57+++ b/components/assist_ranker/ranker_url_fetcher.cc
58@@ -31,6 +31,7 @@ bool RankerURLFetcher::Request( 58@@ -31,6 +31,7 @@ bool RankerURLFetcher::Request(
59 const GURL& url, 59 const GURL& url,
60 RankerURLFetcher::Callback callback, 60 RankerURLFetcher::Callback callback,
@@ -63,11 +63,11 @@
63 // This function is not supposed to be called if the previous operation is not 63 // This function is not supposed to be called if the previous operation is not
64 // finished. 64 // finished.
65 if (state_ == REQUESTING) { 65 if (state_ == REQUESTING) {
66--- components/update_client/update_checker.cc.orig 66--- a/components/update_client/update_checker.cc
67+++ components/update_client/update_checker.cc 67+++ b/components/update_client/update_checker.cc
68@@ -129,6 +129,7 @@ void UpdateCheckerImpl::CheckForUpdates( 68@@ -108,6 +108,7 @@ void UpdateCheckerImpl::CheckForUpdates(
69 const IdToComponentPtrMap& components,
69 const base::flat_map<std::string, std::string>& additional_attributes, 70 const base::flat_map<std::string, std::string>& additional_attributes,
70 bool enabled_component_updates,
71 UpdateCheckCallback update_check_callback) { 71 UpdateCheckCallback update_check_callback) {
72+ return; 72+ return;
73 DCHECK(thread_checker_.CalledOnValidThread()); 73 DCHECK(thread_checker_.CalledOnValidThread());
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch b/www/chromium-uc/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
index 8b68a77..f8e7844 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
@@ -1,9 +1,9 @@
1# Block all connection requests with 'qjz9zk' in the domain name or with a 'trk:' scheme. 1# Block all connection requests with 'qjz9zk' in the domain name or with a 'trk:' scheme.
2# This patch is based on Iridium's 'net: add "trk:" scheme and help identify URLs being retrieved' 2# This patch is based on Iridium's 'net: add "trk:" scheme and help identify URLs being retrieved'
3 3
4--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 4--- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
5+++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc 5+++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
6@@ -56,6 +56,7 @@ ChromeAutocompleteSchemeClassifier::GetI 6@@ -58,6 +58,7 @@ ChromeAutocompleteSchemeClassifier::GetI
7 if (base::IsStringASCII(scheme) && 7 if (base::IsStringASCII(scheme) &&
8 (ProfileIOData::IsHandledProtocol(scheme) || 8 (ProfileIOData::IsHandledProtocol(scheme) ||
9 base::LowerCaseEqualsASCII(scheme, content::kViewSourceScheme) || 9 base::LowerCaseEqualsASCII(scheme, content::kViewSourceScheme) ||
@@ -11,8 +11,8 @@
11 base::LowerCaseEqualsASCII(scheme, url::kJavaScriptScheme) || 11 base::LowerCaseEqualsASCII(scheme, url::kJavaScriptScheme) ||
12 base::LowerCaseEqualsASCII(scheme, url::kDataScheme))) { 12 base::LowerCaseEqualsASCII(scheme, url::kDataScheme))) {
13 return metrics::OmniboxInputType::URL; 13 return metrics::OmniboxInputType::URL;
14--- chrome/browser/history/history_utils.cc.orig 14--- a/chrome/browser/history/history_utils.cc
15+++ chrome/browser/history/history_utils.cc 15+++ b/chrome/browser/history/history_utils.cc
16@@ -21,6 +21,7 @@ bool CanAddURLToHistory(const GURL& url) 16@@ -21,6 +21,7 @@ bool CanAddURLToHistory(const GURL& url)
17 url.SchemeIs(content::kChromeDevToolsScheme) || 17 url.SchemeIs(content::kChromeDevToolsScheme) ||
18 url.SchemeIs(content::kChromeUIScheme) || 18 url.SchemeIs(content::kChromeUIScheme) ||
@@ -21,21 +21,21 @@
21 url.SchemeIs(chrome::kChromeNativeScheme) || 21 url.SchemeIs(chrome::kChromeNativeScheme) ||
22 url.SchemeIs(chrome::kChromeSearchScheme) || 22 url.SchemeIs(chrome::kChromeSearchScheme) ||
23 url.SchemeIs(dom_distiller::kDomDistillerScheme)) 23 url.SchemeIs(dom_distiller::kDomDistillerScheme))
24--- chrome/browser/ui/singleton_tabs.cc.orig 24--- a/chrome/browser/ui/singleton_tabs.cc
25+++ chrome/browser/ui/singleton_tabs.cc 25+++ b/chrome/browser/ui/singleton_tabs.cc
26@@ -99,7 +99,8 @@ int GetIndexOfExistingTab(Browser* brows 26@@ -102,7 +102,8 @@ int GetIndexOfExistingTab(Browser* brows
27 27 // RewriteURLIfNecessary removes the "view-source:" scheme which could lead
28 // Skip view-source tabs. This is needed because RewriteURLIfNecessary 28 // to incorrect matching, so ensure that the target and the candidate are
29 // removes the "view-source:" scheme which leads to incorrect matching. 29 // either both view-source:, or neither is.
30- if (tab_url.SchemeIs(content::kViewSourceScheme)) 30- if (tab_url.SchemeIs(content::kViewSourceScheme) != target_is_view_source) {
31+ if (tab_url.SchemeIs(content::kViewSourceScheme) || 31+ if (tab_url.SchemeIs(content::kViewSourceScheme) != target_is_view_source ||
32+ tab_url.SchemeIs(url::kTraceScheme)) 32+ tab_url.SchemeIs(url::kTraceScheme)) {
33 continue; 33 continue;
34 }
34 35
35 GURL rewritten_tab_url = tab_url; 36--- a/components/omnibox/browser/autocomplete_input.cc
36--- components/omnibox/browser/autocomplete_input.cc.orig 37+++ b/components/omnibox/browser/autocomplete_input.cc
37+++ components/omnibox/browser/autocomplete_input.cc 38@@ -560,7 +560,8 @@ void AutocompleteInput::ParseForEmphasiz
38@@ -533,7 +533,8 @@ void AutocompleteInput::ParseForEmphasiz
39 // For the view-source and blob schemes, we should emphasize the host of the 39 // For the view-source and blob schemes, we should emphasize the host of the
40 // URL qualified by the view-source or blob prefix. 40 // URL qualified by the view-source or blob prefix.
41 if ((base::LowerCaseEqualsASCII(scheme_str, kViewSourceScheme) || 41 if ((base::LowerCaseEqualsASCII(scheme_str, kViewSourceScheme) ||
@@ -45,8 +45,8 @@
45 (static_cast<int>(text.length()) > after_scheme_and_colon)) { 45 (static_cast<int>(text.length()) > after_scheme_and_colon)) {
46 // Obtain the URL prefixed by view-source or blob and parse it. 46 // Obtain the URL prefixed by view-source or blob and parse it.
47 std::u16string real_url(text.substr(after_scheme_and_colon)); 47 std::u16string real_url(text.substr(after_scheme_and_colon));
48--- components/url_formatter/url_fixer.cc.orig 48--- a/components/url_formatter/url_fixer.cc
49+++ components/url_formatter/url_fixer.cc 49+++ b/components/url_formatter/url_fixer.cc
50@@ -562,6 +562,10 @@ GURL FixupURL(const std::string& text, c 50@@ -562,6 +562,10 @@ GURL FixupURL(const std::string& text, c
51 } 51 }
52 } 52 }
@@ -58,19 +58,19 @@
58 // We handle the file scheme separately. 58 // We handle the file scheme separately.
59 if (scheme == url::kFileScheme) 59 if (scheme == url::kFileScheme)
60 return GURL(parts.scheme.is_valid() ? text : FixupPath(text)); 60 return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
61--- content/browser/child_process_security_policy_impl.cc.orig 61--- a/content/browser/child_process_security_policy_impl.cc
62+++ content/browser/child_process_security_policy_impl.cc 62+++ b/content/browser/child_process_security_policy_impl.cc
63@@ -861,6 +861,7 @@ ChildProcessSecurityPolicyImpl::ChildPro 63@@ -735,6 +735,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
64 RegisterWebSafeScheme(url::kWssScheme);
64 #endif // BUILDFLAG(ENABLE_WEBSOCKETS) 65 #endif // BUILDFLAG(ENABLE_WEBSOCKETS)
65 RegisterWebSafeScheme(url::kFtpScheme);
66 RegisterWebSafeScheme(url::kDataScheme); 66 RegisterWebSafeScheme(url::kDataScheme);
67+ RegisterWebSafeScheme(url::kTraceScheme); 67+ RegisterWebSafeScheme(url::kTraceScheme);
68 RegisterWebSafeScheme("feed");
69 68
70 // TODO(nick): https://crbug.com/651534 blob: and filesystem: schemes embed 69 // TODO(nick): https://crbug.com/651534 blob: and filesystem: schemes embed
71--- net/BUILD.gn.orig 70 // other origins, so we should not treat them as web safe. Remove callers of
72+++ net/BUILD.gn 71--- a/net/BUILD.gn
73@@ -1010,6 +1010,8 @@ component("net") { 72+++ b/net/BUILD.gn
73@@ -1004,6 +1004,8 @@ component("net") {
74 "url_request/report_sender.h", 74 "url_request/report_sender.h",
75 "url_request/static_http_user_agent_settings.cc", 75 "url_request/static_http_user_agent_settings.cc",
76 "url_request/static_http_user_agent_settings.h", 76 "url_request/static_http_user_agent_settings.h",
@@ -80,7 +80,7 @@
80 "url_request/url_fetcher.h", 80 "url_request/url_fetcher.h",
81 "url_request/url_fetcher_core.cc", 81 "url_request/url_fetcher_core.cc",
82--- /dev/null 82--- /dev/null
83+++ net/url_request/trk_protocol_handler.cc 83+++ b/net/url_request/trk_protocol_handler.cc
84@@ -0,0 +1,25 @@ 84@@ -0,0 +1,25 @@
85+// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved. 85+// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved.
86+// Use of this source code is governed by a BSD-style license that can be 86+// Use of this source code is governed by a BSD-style license that can be
@@ -108,8 +108,8 @@
108+ 108+
109+} // namespace net 109+} // namespace net
110--- /dev/null 110--- /dev/null
111+++ net/url_request/trk_protocol_handler.h 111+++ b/net/url_request/trk_protocol_handler.h
112@@ -0,0 +1,32 @@ 112@@ -0,0 +1,30 @@
113+// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved. 113+// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved.
114+// Use of this source code is governed by a BSD-style license that can be 114+// Use of this source code is governed by a BSD-style license that can be
115+// found in the LICENSE file. 115+// found in the LICENSE file.
@@ -118,7 +118,6 @@
118+#define NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_ 118+#define NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
119+ 119+
120+#include "base/compiler_specific.h" 120+#include "base/compiler_specific.h"
121+#include "base/macros.h"
122+#include "net/base/net_export.h" 121+#include "net/base/net_export.h"
123+#include "net/url_request/url_request_job_factory.h" 122+#include "net/url_request/url_request_job_factory.h"
124+ 123+
@@ -131,19 +130,18 @@
131+ : public URLRequestJobFactory::ProtocolHandler { 130+ : public URLRequestJobFactory::ProtocolHandler {
132+ public: 131+ public:
133+ TrkProtocolHandler(); 132+ TrkProtocolHandler();
133+ TrkProtocolHandler(const TrkProtocolHandler&) = delete;
134+ TrkProtocolHandler& operator=(const TrkProtocolHandler&) = delete;
134+ std::unique_ptr<URLRequestJob> CreateJob( 135+ std::unique_ptr<URLRequestJob> CreateJob(
135+ URLRequest* request) const override; 136+ URLRequest* request) const override;
136+ bool IsSafeRedirectTarget(const GURL& location) const override; 137+ bool IsSafeRedirectTarget(const GURL& location) const override;
137+
138+ private:
139+ DISALLOW_COPY_AND_ASSIGN(TrkProtocolHandler);
140+}; 138+};
141+ 139+
142+} // namespace net 140+} // namespace net
143+ 141+
144+#endif // NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_ 142+#endif // NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
145--- net/url_request/url_request.cc.orig 143--- a/net/url_request/url_request.cc
146+++ net/url_request/url_request.cc 144+++ b/net/url_request/url_request.cc
147@@ -12,6 +12,7 @@ 145@@ -12,6 +12,7 @@
148 #include "base/compiler_specific.h" 146 #include "base/compiler_specific.h"
149 #include "base/metrics/histogram_macros.h" 147 #include "base/metrics/histogram_macros.h"
@@ -152,7 +150,7 @@
152 #include "base/strings/utf_string_conversions.h" 150 #include "base/strings/utf_string_conversions.h"
153 #include "base/synchronization/lock.h" 151 #include "base/synchronization/lock.h"
154 #include "base/threading/thread_task_runner_handle.h" 152 #include "base/threading/thread_task_runner_handle.h"
155@@ -46,6 +47,7 @@ 153@@ -45,6 +46,7 @@
156 #include "net/url_request/url_request_redirect_job.h" 154 #include "net/url_request/url_request_redirect_job.h"
157 #include "url/gurl.h" 155 #include "url/gurl.h"
158 #include "url/origin.h" 156 #include "url/origin.h"
@@ -160,7 +158,7 @@
160 158
161 using base::Time; 159 using base::Time;
162 using std::string; 160 using std::string;
163@@ -595,6 +597,12 @@ URLRequest::URLRequest(const GURL& url, 161@@ -609,6 +611,12 @@ URLRequest::URLRequest(const GURL& url,
164 // Sanity check out environment. 162 // Sanity check out environment.
165 DCHECK(base::ThreadTaskRunnerHandle::IsSet()); 163 DCHECK(base::ThreadTaskRunnerHandle::IsSet());
166 164
@@ -173,17 +171,17 @@
173 context->url_requests()->insert(this); 171 context->url_requests()->insert(this);
174 net_log_.BeginEvent(NetLogEventType::REQUEST_ALIVE, [&] { 172 net_log_.BeginEvent(NetLogEventType::REQUEST_ALIVE, [&] {
175 return NetLogURLRequestConstructorParams(url, priority_, 173 return NetLogURLRequestConstructorParams(url, priority_,
176--- net/url_request/url_request_context_builder.cc.orig 174--- a/net/url_request/url_request_context_builder.cc
177+++ net/url_request/url_request_context_builder.cc 175+++ b/net/url_request/url_request_context_builder.cc
178@@ -46,6 +46,7 @@ 176@@ -47,6 +47,7 @@
179 #include "net/quic/quic_stream_factory.h" 177 #include "net/socket/network_binding_client_socket_factory.h"
180 #include "net/ssl/ssl_config_service_defaults.h" 178 #include "net/ssl/ssl_config_service_defaults.h"
181 #include "net/url_request/static_http_user_agent_settings.h" 179 #include "net/url_request/static_http_user_agent_settings.h"
182+#include "net/url_request/trk_protocol_handler.h" 180+#include "net/url_request/trk_protocol_handler.h"
183 #include "net/url_request/url_request_context.h" 181 #include "net/url_request/url_request_context.h"
184 #include "net/url_request/url_request_context_storage.h" 182 #include "net/url_request/url_request_context_storage.h"
185 #include "net/url_request/url_request_job_factory.h" 183 #include "net/url_request/url_request_job_factory.h"
186@@ -546,6 +547,9 @@ std::unique_ptr<URLRequestContext> URLRe 184@@ -628,6 +629,9 @@ std::unique_ptr<URLRequestContext> URLRe
187 } 185 }
188 protocol_handlers_.clear(); 186 protocol_handlers_.clear();
189 187
@@ -193,28 +191,30 @@
193 storage->set_job_factory(std::move(job_factory)); 191 storage->set_job_factory(std::move(job_factory));
194 192
195 return std::move(context); 193 return std::move(context);
196--- url/url_constants.cc.orig 194--- a/url/url_constants.cc
197+++ url/url_constants.cc 195+++ b/url/url_constants.cc
198@@ -28,6 +28,7 @@ const char kMailToScheme[] = "mailto"; 196@@ -46,6 +46,8 @@ const char kQuicTransportScheme[] = "qui
199 // See also: https://www.iana.org/assignments/uri-schemes/prov/quic-transport 197 const char16_t kQuicTransportScheme16[] = u"quic-transport";
200 const char kQuicTransportScheme[] = "quic-transport";
201 const char kTelScheme[] = "tel"; 198 const char kTelScheme[] = "tel";
199 const char16_t kTelScheme16[] = u"tel";
202+const char kTraceScheme[] = "trk"; 200+const char kTraceScheme[] = "trk";
201+const char16_t kTraceScheme16[] = u"trk";
203 const char kUrnScheme[] = "urn"; 202 const char kUrnScheme[] = "urn";
204 const char kWsScheme[] = "ws"; 203 const char16_t kUrnScheme16[] = u"urn";
205 const char kWssScheme[] = "wss"; 204 const char kUuidInPackageScheme[] = "uuid-in-package";
206--- url/url_constants.h.orig 205--- a/url/url_constants.h
207+++ url/url_constants.h 206+++ b/url/url_constants.h
208@@ -32,6 +32,7 @@ COMPONENT_EXPORT(URL) extern const char 207@@ -50,6 +50,8 @@ COMPONENT_EXPORT(URL) extern const char
209 COMPONENT_EXPORT(URL) extern const char kMailToScheme[]; 208 COMPONENT_EXPORT(URL) extern const char16_t kQuicTransportScheme16[];
210 COMPONENT_EXPORT(URL) extern const char kQuicTransportScheme[];
211 COMPONENT_EXPORT(URL) extern const char kTelScheme[]; 209 COMPONENT_EXPORT(URL) extern const char kTelScheme[];
210 COMPONENT_EXPORT(URL) extern const char16_t kTelScheme16[];
212+COMPONENT_EXPORT(URL) extern const char kTraceScheme[]; 211+COMPONENT_EXPORT(URL) extern const char kTraceScheme[];
212+COMPONENT_EXPORT(URL) extern const char16_t kTraceScheme16[];
213 COMPONENT_EXPORT(URL) extern const char kUrnScheme[]; 213 COMPONENT_EXPORT(URL) extern const char kUrnScheme[];
214 COMPONENT_EXPORT(URL) extern const char kWsScheme[]; 214 COMPONENT_EXPORT(URL) extern const char16_t kUrnScheme16[];
215 COMPONENT_EXPORT(URL) extern const char kWssScheme[]; 215 COMPONENT_EXPORT(URL) extern const char kUuidInPackageScheme[];
216--- url/url_util.cc.orig 216--- a/url/url_util.cc
217+++ url/url_util.cc 217+++ b/url/url_util.cc
218@@ -63,7 +63,7 @@ struct SchemeRegistry { 218@@ -63,7 +63,7 @@ struct SchemeRegistry {
219 219
220 // Schemes that do not trigger mixed content warning. 220 // Schemes that do not trigger mixed content warning.
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-crash-reporter.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-crash-reporter.patch
index a4b3c51..e23a778 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/disable-crash-reporter.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-crash-reporter.patch
@@ -1,8 +1,8 @@
1# Disable some background communication with clients2.google.com 1# Disable some background communication with clients2.google.com
2 2
3--- components/crash/core/app/crashpad_linux.cc.orig 3--- a/components/crash/core/app/crashpad_linux.cc
4+++ components/crash/core/app/crashpad_linux.cc 4+++ b/components/crash/core/app/crashpad_linux.cc
5@@ -59,8 +59,7 @@ void SetFirstChanceExceptionHandler(bool 5@@ -60,8 +60,7 @@ void SetFirstChanceExceptionHandler(bool
6 } 6 }
7 7
8 bool IsCrashpadEnabled() { 8 bool IsCrashpadEnabled() {
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-domain-reliability.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-domain-reliability.patch
index adc446c..d342db3 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/disable-domain-reliability.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-domain-reliability.patch
@@ -2,8 +2,8 @@
2# Many of these changes are for thoroughness, 2# Many of these changes are for thoroughness,
3# the most significant changes are in service_factory.cc and uploader.cc 3# the most significant changes are in service_factory.cc and uploader.cc
4 4
5--- chrome/browser/domain_reliability/service_factory.cc.orig 5--- a/chrome/browser/domain_reliability/service_factory.cc
6+++ chrome/browser/domain_reliability/service_factory.cc 6+++ b/chrome/browser/domain_reliability/service_factory.cc
7@@ -11,34 +11,12 @@ 7@@ -11,34 +11,12 @@
8 8
9 namespace domain_reliability { 9 namespace domain_reliability {
@@ -40,8 +40,8 @@
40 } 40 }
41 41
42 } // namespace domain_reliability 42 } // namespace domain_reliability
43--- components/domain_reliability/BUILD.gn.orig 43--- a/components/domain_reliability/BUILD.gn
44+++ components/domain_reliability/BUILD.gn 44+++ b/components/domain_reliability/BUILD.gn
45@@ -7,26 +7,6 @@ action("bake_in_configs") { 45@@ -7,26 +7,6 @@ action("bake_in_configs") {
46 script = "bake_in_configs.py" 46 script = "bake_in_configs.py"
47 47
@@ -98,8 +98,8 @@
98 } 98 }
99 99
100 component("domain_reliability") { 100 component("domain_reliability") {
101--- components/domain_reliability/bake_in_configs.py.orig 101--- a/components/domain_reliability/bake_in_configs.py
102+++ components/domain_reliability/bake_in_configs.py 102+++ b/components/domain_reliability/bake_in_configs.py
103@@ -490,7 +490,7 @@ def origin_is_whitelisted(origin): 103@@ -490,7 +490,7 @@ def origin_is_whitelisted(origin):
104 domain = origin[8:-1] 104 domain = origin[8:-1]
105 else: 105 else:
@@ -109,9 +109,9 @@
109 109
110 110
111 def quote_and_wrap_text(text, width=79, prefix=' "', suffix='"'): 111 def quote_and_wrap_text(text, width=79, prefix=' "', suffix='"'):
112--- components/domain_reliability/google_configs.cc.orig 112--- a/components/domain_reliability/google_configs.cc
113+++ components/domain_reliability/google_configs.cc 113+++ b/components/domain_reliability/google_configs.cc
114@@ -11,564 +11,6 @@ 114@@ -11,548 +11,6 @@
115 115
116 namespace domain_reliability { 116 namespace domain_reliability {
117 117
@@ -402,9 +402,6 @@
402- {"ampproject.net", true, false, false}, 402- {"ampproject.net", true, false, false},
403- {"ampproject.org", true, false, false}, 403- {"ampproject.org", true, false, false},
404- {"android.com", true, false, false}, 404- {"android.com", true, false, false},
405- {"anycast-edge.metric.gstatic.com", true, false, false},
406- {"anycast-stb.metric.gstatic.com", true, false, false},
407- {"anycast.metric.gstatic.com", true, false, false},
408- {"cdn.ampproject.org", true, false, false}, 405- {"cdn.ampproject.org", true, false, false},
409- {"chromecast.com", true, false, false}, 406- {"chromecast.com", true, false, false},
410- {"chromeexperiments.com", true, false, false}, 407- {"chromeexperiments.com", true, false, false},
@@ -461,19 +458,6 @@
461- {"picasa.com", true, false, false}, 458- {"picasa.com", true, false, false},
462- {"recaptcha.net", true, false, false}, 459- {"recaptcha.net", true, false, false},
463- {"stackdriver.com", true, false, false}, 460- {"stackdriver.com", true, false, false},
464- {"stbcast-stb.metric.gstatic.com", true, false, false},
465- {"stbcast.metric.gstatic.com", true, false, false},
466- {"stbcast2-stb.metric.gstatic.com", true, false, false},
467- {"stbcast2.metric.gstatic.com", true, false, false},
468- {"stbcast3-stb.metric.gstatic.com", true, false, false},
469- {"stbcast3.metric.gstatic.com", true, false, false},
470- {"stbcast4-stb.metric.gstatic.com", true, false, false},
471- {"stbcast4.metric.gstatic.com", true, false, false},
472- {"unicast-edge.metric.gstatic.com", true, false, false},
473- {"unicast-stb.metric.gstatic.com", true, false, false},
474- {"unicast.metric.gstatic.com", true, false, false},
475- {"unicast2-stb.metric.gstatic.com", true, false, false},
476- {"unicast2.metric.gstatic.com", true, false, false},
477- {"waze.com", true, false, false}, 461- {"waze.com", true, false, false},
478- {"withgoogle.com", true, false, false}, 462- {"withgoogle.com", true, false, false},
479- {"youtu.be", true, false, false}, 463- {"youtu.be", true, false, false},
@@ -676,7 +660,7 @@
676 std::unique_ptr<const DomainReliabilityConfig> MaybeGetGoogleConfig( 660 std::unique_ptr<const DomainReliabilityConfig> MaybeGetGoogleConfig(
677 const std::string& hostname) { 661 const std::string& hostname) {
678 bool is_www_subdomain = 662 bool is_www_subdomain =
679@@ -578,23 +20,6 @@ std::unique_ptr<const DomainReliabilityC 663@@ -562,23 +20,6 @@ std::unique_ptr<const DomainReliabilityC
680 std::unique_ptr<const DomainReliabilityConfig> config; 664 std::unique_ptr<const DomainReliabilityConfig> config;
681 std::unique_ptr<const DomainReliabilityConfig> superdomain_config; 665 std::unique_ptr<const DomainReliabilityConfig> superdomain_config;
682 666
@@ -700,7 +684,7 @@
700 if (config) { 684 if (config) {
701 DCHECK(config->origin.host() == hostname); 685 DCHECK(config->origin.host() == hostname);
702 return config; 686 return config;
703@@ -613,11 +38,6 @@ std::vector<std::unique_ptr<const Domain 687@@ -597,11 +38,6 @@ std::vector<std::unique_ptr<const Domain
704 GetAllGoogleConfigsForTesting() { 688 GetAllGoogleConfigsForTesting() {
705 std::vector<std::unique_ptr<const DomainReliabilityConfig>> configs_out; 689 std::vector<std::unique_ptr<const DomainReliabilityConfig>> configs_out;
706 690
@@ -712,9 +696,9 @@
712 return configs_out; 696 return configs_out;
713 } 697 }
714 698
715--- components/domain_reliability/uploader.cc.orig 699--- a/components/domain_reliability/uploader.cc
716+++ components/domain_reliability/uploader.cc 700+++ b/components/domain_reliability/uploader.cc
717@@ -79,7 +79,7 @@ class DomainReliabilityUploaderImpl : pu 701@@ -80,7 +80,7 @@ class DomainReliabilityUploaderImpl : pu
718 if (discard_uploads_) 702 if (discard_uploads_)
719 discarded_upload_count_++; 703 discarded_upload_count_++;
720 704
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-floc.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-floc.patch
deleted file mode 100644
index 3ef84c2..0000000
--- a/www/chromium-uc/patches/core/ungoogled-chromium/disable-floc.patch
+++ /dev/null
@@ -1,78 +0,0 @@
1--- chrome/browser/federated_learning/floc_id_provider_factory.cc.orig
2+++ chrome/browser/federated_learning/floc_id_provider_factory.cc
3@@ -49,42 +49,7 @@ FlocIdProviderFactory::~FlocIdProviderFa
4
5 KeyedService* FlocIdProviderFactory::BuildServiceInstanceFor(
6 content::BrowserContext* context) const {
7- if (!base::FeatureList::IsEnabled(kFederatedLearningOfCohorts))
8- return nullptr;
9-
10- Profile* profile = Profile::FromBrowserContext(context);
11-
12- syncer::SyncService* sync_service =
13- SyncServiceFactory::GetForProfile(profile);
14- if (!sync_service)
15- return nullptr;
16-
17- PrivacySandboxSettings* privacy_sandbox_settings =
18- PrivacySandboxSettingsFactory::GetForProfile(profile);
19- if (!privacy_sandbox_settings)
20- return nullptr;
21-
22- FlocRemotePermissionService* floc_remote_permission_service =
23- FlocRemotePermissionServiceFactory::GetForProfile(profile);
24- if (!floc_remote_permission_service)
25- return nullptr;
26-
27- history::HistoryService* history_service =
28- HistoryServiceFactory::GetForProfile(profile,
29- ServiceAccessType::IMPLICIT_ACCESS);
30- if (!history_service)
31- return nullptr;
32-
33- syncer::UserEventService* user_event_service =
34- browser_sync::UserEventServiceFactory::GetForProfile(profile);
35- if (!user_event_service)
36- return nullptr;
37-
38- auto floc_event_logger = std::make_unique<FlocEventLogger>(
39- sync_service, floc_remote_permission_service, user_event_service);
40-
41- return new FlocIdProviderImpl(profile->GetPrefs(), privacy_sandbox_settings,
42- history_service, std::move(floc_event_logger));
43+ return nullptr;
44 }
45
46 } // namespace federated_learning
47--- chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc.orig
48+++ chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc
49@@ -132,8 +132,7 @@ bool ShouldDisablePrivacySandbox(
50
51 // Returns whether FLoC is allowable by the current state of |pref_service|.
52 bool IsFlocAllowedByPrefs(PrefService* pref_service) {
53- return pref_service->GetBoolean(prefs::kPrivacySandboxFlocEnabled) &&
54- pref_service->GetBoolean(prefs::kPrivacySandboxApisEnabled);
55+ return false;
56 }
57
58 // Returns the number of days in |time|, rounded to the closest day by hour if
59@@ -207,7 +206,7 @@ PrivacySandboxSettings::PrivacySandboxSe
60 PrivacySandboxSettings::~PrivacySandboxSettings() = default;
61
62 bool PrivacySandboxSettings::IsFlocAllowed() const {
63- return IsFlocAllowedByPrefs(pref_service_);
64+ return false;
65 }
66
67 bool PrivacySandboxSettings::IsFlocAllowedForContext(
68--- components/privacy_sandbox/privacy_sandbox_prefs.cc.orig
69+++ components/privacy_sandbox/privacy_sandbox_prefs.cc
70@@ -42,7 +42,7 @@ void RegisterProfilePrefs(PrefRegistrySi
71 registry->RegisterTimePref(prefs::kPrivacySandboxFlocDataAccessibleSince,
72 base::Time());
73 registry->RegisterBooleanPref(
74- prefs::kPrivacySandboxFlocEnabled, true,
75+ prefs::kPrivacySandboxFlocEnabled, false,
76 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
77 }
78
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch
index e969364..ebfc63a 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch
@@ -1,7 +1,7 @@
1# Disables references to fonts.googleapis.com 1# Disables references to fonts.googleapis.com
2 2
3--- chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html.orig 3--- a/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html
4+++ chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html 4+++ b/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html
5@@ -5,7 +5,7 @@ 5@@ -5,7 +5,7 @@
6 <meta name="viewport" 6 <meta name="viewport"
7 content="initial-scale=1, minimum-scale=1,width=device-width"> 7 content="initial-scale=1, minimum-scale=1,width=device-width">
@@ -11,8 +11,8 @@
11 <link rel="stylesheet" href="../../../../../../../components/security_interstitials/core/common/resources/interstitial_core.css"> 11 <link rel="stylesheet" href="../../../../../../../components/security_interstitials/core/common/resources/interstitial_core.css">
12 <link rel="stylesheet" href="../../../../../supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.css"> 12 <link rel="stylesheet" href="../../../../../supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.css">
13 </head> 13 </head>
14--- chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css.orig 14--- a/chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css
15+++ chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css 15+++ b/chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css
16@@ -2,7 +2,7 @@ 16@@ -2,7 +2,7 @@
17 * Use of this source code is governed by a BSD-style license that can be 17 * Use of this source code is governed by a BSD-style license that can be
18 * found in the LICENSE file. */ 18 * found in the LICENSE file. */
@@ -22,8 +22,8 @@
22 22
23 body { 23 body {
24 margin: 0 0 20px 0; 24 margin: 0 0 20px 0;
25--- chrome/browser/resources/chromeos/accessibility/select_to_speak/options.css.orig 25--- a/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.css
26+++ chrome/browser/resources/chromeos/accessibility/select_to_speak/options.css 26+++ b/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.css
27@@ -2,7 +2,7 @@ 27@@ -2,7 +2,7 @@
28 * Use of this source code is governed by a BSD-style license that can be 28 * Use of this source code is governed by a BSD-style license that can be
29 * found in the LICENSE file. */ 29 * found in the LICENSE file. */
@@ -33,8 +33,8 @@
33 33
34 body { 34 body {
35 margin: 0 0 20px 0; 35 margin: 0 0 20px 0;
36--- chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.html.orig 36--- a/chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.html
37+++ chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.html 37+++ b/chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.html
38@@ -5,7 +5,7 @@ 38@@ -5,7 +5,7 @@
39 <meta name="viewport" 39 <meta name="viewport"
40 content="initial-scale=1, minimum-scale=1, width=device-width"> 40 content="initial-scale=1, minimum-scale=1, width=device-width">
@@ -44,9 +44,9 @@
44 <link rel="stylesheet" href="../../../../../components/security_interstitials/core/common/resources/interstitial_core.css"> 44 <link rel="stylesheet" href="../../../../../components/security_interstitials/core/common/resources/interstitial_core.css">
45 <link rel="stylesheet" href="supervised_user_block_interstitial.css"> 45 <link rel="stylesheet" href="supervised_user_block_interstitial.css">
46 <script src="../../../../../ui/webui/resources/js/cr.js"></script> 46 <script src="../../../../../ui/webui/resources/js/cr.js"></script>
47--- components/dom_distiller/content/browser/dom_distiller_viewer_source.cc.orig 47--- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
48+++ components/dom_distiller/content/browser/dom_distiller_viewer_source.cc 48+++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
49@@ -300,7 +300,7 @@ bool DomDistillerViewerSource::ShouldSer 49@@ -298,7 +298,7 @@ bool DomDistillerViewerSource::ShouldSer
50 std::string DomDistillerViewerSource::GetContentSecurityPolicy( 50 std::string DomDistillerViewerSource::GetContentSecurityPolicy(
51 network::mojom::CSPDirectiveName directive) { 51 network::mojom::CSPDirectiveName directive) {
52 if (directive == network::mojom::CSPDirectiveName::StyleSrc) { 52 if (directive == network::mojom::CSPDirectiveName::StyleSrc) {
@@ -55,8 +55,8 @@
55 } else if (directive == network::mojom::CSPDirectiveName::ChildSrc) { 55 } else if (directive == network::mojom::CSPDirectiveName::ChildSrc) {
56 return "child-src *;"; 56 return "child-src *;";
57 } else if (directive == 57 } else if (directive ==
58--- components/dom_distiller/core/html/preview.html.orig 58--- a/components/dom_distiller/core/html/preview.html
59+++ components/dom_distiller/core/html/preview.html 59+++ b/components/dom_distiller/core/html/preview.html
60@@ -11,7 +11,7 @@ found in the LICENSE file. 60@@ -11,7 +11,7 @@ found in the LICENSE file.
61 <meta name="theme-color" id="theme-color"> 61 <meta name="theme-color" id="theme-color">
62 <title>Title goes here and it could be kind of lengthy - Publisher name</title> 62 <title>Title goes here and it could be kind of lengthy - Publisher name</title>
@@ -66,8 +66,8 @@
66 <style> 66 <style>
67 .english :lang(th) {display: none} 67 .english :lang(th) {display: none}
68 .english :lang(zh) {display: none} 68 .english :lang(zh) {display: none}
69--- components/dom_distiller/core/javascript/dom_distiller_viewer.js.orig 69--- a/components/dom_distiller/core/javascript/dom_distiller_viewer.js
70+++ components/dom_distiller/core/javascript/dom_distiller_viewer.js 70+++ b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
71@@ -109,7 +109,7 @@ function maybeSetWebFont() { 71@@ -109,7 +109,7 @@ function maybeSetWebFont() {
72 } 72 }
73 73
@@ -77,8 +77,8 @@
77 e.rel = 'stylesheet'; 77 e.rel = 'stylesheet';
78 e.type = 'text/css'; 78 e.type = 'text/css';
79 document.head.appendChild(e); 79 document.head.appendChild(e);
80--- third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css.orig 80--- a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
81+++ third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css 81+++ b/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
82@@ -12,8 +12,7 @@ 82@@ -12,8 +12,7 @@
83 * See the License for the specific language governing permissions and 83 * See the License for the specific language governing permissions and
84 * limitations under the License. */ 84 * limitations under the License. */
@@ -89,8 +89,8 @@
89 89
90 body, 90 body,
91 table, 91 table,
92--- tools/md_browser/base.css.orig 92--- a/tools/md_browser/base.css
93+++ tools/md_browser/base.css 93+++ b/tools/md_browser/base.css
94@@ -16,8 +16,7 @@ 94@@ -16,8 +16,7 @@
95 95
96 /* Common styles and definitions. */ 96 /* Common styles and definitions. */
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-gaia.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-gaia.patch
index bc27e5d..5aa8290 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/disable-gaia.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-gaia.patch
@@ -1,9 +1,9 @@
1# Disables Gaia code 1# Disables Gaia code
2# Somehow it is still activated even without being signed-in: https://github.com/Eloston/ungoogled-chromium/issues/104 2# Somehow it is still activated even without being signed-in: https://github.com/Eloston/ungoogled-chromium/issues/104
3 3
4--- google_apis/gaia/gaia_auth_fetcher.cc.orig 4--- a/google_apis/gaia/gaia_auth_fetcher.cc
5+++ google_apis/gaia/gaia_auth_fetcher.cc 5+++ b/google_apis/gaia/gaia_auth_fetcher.cc
6@@ -293,65 +293,6 @@ void GaiaAuthFetcher::CreateAndStartGaia 6@@ -292,66 +292,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
7 network::mojom::CredentialsMode credentials_mode, 7 network::mojom::CredentialsMode credentials_mode,
8 const net::NetworkTrafficAnnotationTag& traffic_annotation) { 8 const net::NetworkTrafficAnnotationTag& traffic_annotation) {
9 DCHECK(!fetch_pending_) << "Tried to fetch two things at once!"; 9 DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
@@ -13,7 +13,8 @@
13- original_url_ = gaia_gurl; 13- original_url_ = gaia_gurl;
14- 14-
15- if (credentials_mode != network::mojom::CredentialsMode::kOmit) { 15- if (credentials_mode != network::mojom::CredentialsMode::kOmit) {
16- DCHECK_EQ(GaiaUrls::GetInstance()->gaia_url(), gaia_gurl.GetOrigin()) 16- DCHECK_EQ(GaiaUrls::GetInstance()->gaia_url(),
17- gaia_gurl.DeprecatedGetOriginAsURL())
17- << gaia_gurl; 18- << gaia_gurl;
18- url::Origin origin = 19- url::Origin origin =
19- url::Origin::Create(GaiaUrls::GetInstance()->gaia_url()); 20- url::Origin::Create(GaiaUrls::GetInstance()->gaia_url());
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-gcm.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-gcm.patch
index bafa024..7838c20 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/disable-gcm.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-gcm.patch
@@ -1,7 +1,7 @@
1# Disable Google Cloud Messaging (GCM) client 1# Disable Google Cloud Messaging (GCM) client
2 2
3--- components/gcm_driver/gcm_client_impl.cc.orig 3--- a/components/gcm_driver/gcm_client_impl.cc
4+++ components/gcm_driver/gcm_client_impl.cc 4+++ b/components/gcm_driver/gcm_client_impl.cc
5@@ -465,6 +465,7 @@ void GCMClientImpl::StartGCM() { 5@@ -465,6 +465,7 @@ void GCMClientImpl::StartGCM() {
6 6
7 void GCMClientImpl::InitializeMCSClient() { 7 void GCMClientImpl::InitializeMCSClient() {
@@ -52,7 +52,7 @@
52- periodic_checkin_ptr_factory_.InvalidateWeakPtrs(); 52- periodic_checkin_ptr_factory_.InvalidateWeakPtrs();
53- 53-
54- base::TimeDelta time_to_next_checkin = GetTimeToNextCheckin(); 54- base::TimeDelta time_to_next_checkin = GetTimeToNextCheckin();
55- if (time_to_next_checkin < base::TimeDelta()) 55- if (time_to_next_checkin.is_negative())
56- time_to_next_checkin = base::TimeDelta(); 56- time_to_next_checkin = base::TimeDelta();
57- 57-
58- io_task_runner_->PostDelayedTask( 58- io_task_runner_->PostDelayedTask(
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-google-host-detection.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-google-host-detection.patch
index 846904d..adc4f31 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/disable-google-host-detection.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-google-host-detection.patch
@@ -1,7 +1,7 @@
1# Disables various detections of Google hosts and functionality specific to them 1# Disables various detections of Google hosts and functionality specific to them
2 2
3--- chrome/common/google_url_loader_throttle.cc.orig 3--- a/chrome/common/google_url_loader_throttle.cc
4+++ chrome/common/google_url_loader_throttle.cc 4+++ b/chrome/common/google_url_loader_throttle.cc
5@@ -19,10 +19,6 @@ 5@@ -19,10 +19,6 @@
6 #include "ui/base/device_form_factor.h" 6 #include "ui/base/device_form_factor.h"
7 #endif 7 #endif
@@ -12,7 +12,7 @@
12- 12-
13 namespace { 13 namespace {
14 14
15 #if defined(OS_ANDROID) 15 #if BUILDFLAG(IS_ANDROID)
16@@ -65,52 +61,6 @@ void GoogleURLLoaderThrottle::DetachFrom 16@@ -65,52 +61,6 @@ void GoogleURLLoaderThrottle::DetachFrom
17 void GoogleURLLoaderThrottle::WillStartRequest( 17 void GoogleURLLoaderThrottle::WillStartRequest(
18 network::ResourceRequest* request, 18 network::ResourceRequest* request,
@@ -43,7 +43,7 @@
43- dynamic_params_.allowed_domains_for_apps); 43- dynamic_params_.allowed_domains_for_apps);
44- } 44- }
45- 45-
46-#if defined(OS_ANDROID) 46-#if BUILDFLAG(IS_ANDROID)
47- if (!client_data_header_.empty() && 47- if (!client_data_header_.empty() &&
48- google_util::IsGoogleAssociatedDomainUrl(request->url)) { 48- google_util::IsGoogleAssociatedDomainUrl(request->url)) {
49- request->cors_exempt_headers.SetHeader(kCCTClientDataHeader, 49- request->cors_exempt_headers.SetHeader(kCCTClientDataHeader,
@@ -95,7 +95,7 @@
95- dynamic_params_.allowed_domains_for_apps); 95- dynamic_params_.allowed_domains_for_apps);
96- } 96- }
97- 97-
98-#if defined(OS_ANDROID) 98-#if BUILDFLAG(IS_ANDROID)
99- if (!client_data_header_.empty() && 99- if (!client_data_header_.empty() &&
100- !google_util::IsGoogleAssociatedDomainUrl(redirect_info->new_url)) { 100- !google_util::IsGoogleAssociatedDomainUrl(redirect_info->new_url)) {
101- to_be_removed_headers->push_back(kCCTClientDataHeader); 101- to_be_removed_headers->push_back(kCCTClientDataHeader);
@@ -128,9 +128,9 @@
128- } 128- }
129 } 129 }
130 #endif 130 #endif
131--- components/google/core/common/google_util.cc.orig 131--- a/components/google/core/common/google_util.cc
132+++ components/google/core/common/google_util.cc 132+++ b/components/google/core/common/google_util.cc
133@@ -33,112 +33,6 @@ namespace google_util { 133@@ -31,112 +31,6 @@ namespace google_util {
134 134
135 namespace { 135 namespace {
136 136
@@ -243,7 +243,7 @@
243 } // namespace 243 } // namespace
244 244
245 // Global functions ----------------------------------------------------------- 245 // Global functions -----------------------------------------------------------
246@@ -146,12 +40,6 @@ bool IsGoogleSearchSubdomainUrl(const GU 246@@ -144,12 +38,6 @@ bool IsGoogleSearchSubdomainUrl(const GU
247 const char kGoogleHomepageURL[] = "trk:113:https://www.google.com/"; 247 const char kGoogleHomepageURL[] = "trk:113:https://www.google.com/";
248 248
249 bool HasGoogleSearchQueryParam(base::StringPiece str) { 249 bool HasGoogleSearchQueryParam(base::StringPiece str) {
@@ -256,7 +256,7 @@
256 return false; 256 return false;
257 } 257 }
258 258
259@@ -162,161 +50,53 @@ std::string GetGoogleLocale(const std::s 259@@ -160,161 +48,53 @@ std::string GetGoogleLocale(const std::s
260 260
261 GURL AppendGoogleLocaleParam(const GURL& url, 261 GURL AppendGoogleLocaleParam(const GURL& url,
262 const std::string& application_locale) { 262 const std::string& application_locale) {
@@ -409,7 +409,7 @@
409- ".ytimg.com", 409- ".ytimg.com",
410- }; 410- };
411- const std::string host = url.host(); 411- const std::string host = url.host();
412- for (size_t i = 0; i < base::size(kSuffixesToSetHeadersFor); ++i) { 412- for (size_t i = 0; i < std::size(kSuffixesToSetHeadersFor); ++i) {
413- if (base::EndsWith(host, kSuffixesToSetHeadersFor[i], 413- if (base::EndsWith(host, kSuffixesToSetHeadersFor[i],
414- base::CompareCase::INSENSITIVE_ASCII)) { 414- base::CompareCase::INSENSITIVE_ASCII)) {
415- return true; 415- return true;
@@ -420,7 +420,7 @@
420- static const char* kHostsToSetHeadersFor[] = { 420- static const char* kHostsToSetHeadersFor[] = {
421- "googleweblight.com", 421- "googleweblight.com",
422- }; 422- };
423- for (size_t i = 0; i < base::size(kHostsToSetHeadersFor); ++i) { 423- for (size_t i = 0; i < std::size(kHostsToSetHeadersFor); ++i) {
424- if (base::LowerCaseEqualsASCII(host, kHostsToSetHeadersFor[i])) 424- if (base::LowerCaseEqualsASCII(host, kHostsToSetHeadersFor[i]))
425- return true; 425- return true;
426- } 426- }
@@ -428,9 +428,9 @@
428 return false; 428 return false;
429 } 429 }
430 430
431--- components/page_load_metrics/browser/page_load_metrics_util.cc.orig 431--- a/components/page_load_metrics/browser/page_load_metrics_util.cc
432+++ components/page_load_metrics/browser/page_load_metrics_util.cc 432+++ b/components/page_load_metrics/browser/page_load_metrics_util.cc
433@@ -196,9 +196,7 @@ bool DidObserveLoadingBehaviorInAnyFrame 433@@ -210,9 +210,7 @@ bool DidObserveLoadingBehaviorInAnyFrame
434 } 434 }
435 435
436 bool IsGoogleSearchHostname(const GURL& url) { 436 bool IsGoogleSearchHostname(const GURL& url) {
@@ -441,9 +441,9 @@
441 } 441 }
442 442
443 bool IsGoogleSearchResultUrl(const GURL& url) { 443 bool IsGoogleSearchResultUrl(const GURL& url) {
444--- components/page_load_metrics/common/page_load_metrics_util.cc.orig 444--- a/components/page_load_metrics/common/page_load_metrics_util.cc
445+++ components/page_load_metrics/common/page_load_metrics_util.cc 445+++ b/components/page_load_metrics/common/page_load_metrics_util.cc
446@@ -36,38 +36,7 @@ const char* kBufferTimerDelayParamName = 446@@ -24,38 +24,7 @@ const int kExtraBufferTimerDelayMillis =
447 } // namespace 447 } // namespace
448 448
449 absl::optional<std::string> GetGoogleHostnamePrefix(const GURL& url) { 449 absl::optional<std::string> GetGoogleHostnamePrefix(const GURL& url) {
@@ -483,9 +483,9 @@
483 } 483 }
484 484
485 bool IsGoogleHostname(const GURL& url) { 485 bool IsGoogleHostname(const GURL& url) {
486--- components/search_engines/template_url.cc.orig 486--- a/components/search_engines/template_url.cc
487+++ components/search_engines/template_url.cc 487+++ b/components/search_engines/template_url.cc
488@@ -527,11 +527,7 @@ std::u16string TemplateURLRef::SearchTer 488@@ -532,11 +532,7 @@ std::u16string TemplateURLRef::SearchTer
489 bool TemplateURLRef::HasGoogleBaseURLs( 489 bool TemplateURLRef::HasGoogleBaseURLs(
490 const SearchTermsData& search_terms_data) const { 490 const SearchTermsData& search_terms_data) const {
491 ParseIfNecessary(search_terms_data); 491 ParseIfNecessary(search_terms_data);
@@ -498,9 +498,9 @@
498 } 498 }
499 499
500 bool TemplateURLRef::ExtractSearchTermsFromURL( 500 bool TemplateURLRef::ExtractSearchTermsFromURL(
501--- components/variations/net/variations_http_headers.cc.orig 501--- a/components/variations/net/variations_http_headers.cc
502+++ components/variations/net/variations_http_headers.cc 502+++ b/components/variations/net/variations_http_headers.cc
503@@ -26,10 +26,6 @@ 503@@ -33,10 +33,6 @@
504 504
505 namespace variations { 505 namespace variations {
506 506
@@ -511,7 +511,7 @@
511 namespace { 511 namespace {
512 512
513 // The result of checking whether a request to a URL should have variations 513 // The result of checking whether a request to a URL should have variations
514@@ -238,29 +234,7 @@ class VariationsHeaderHelper { 514@@ -257,30 +253,7 @@ class VariationsHeaderHelper {
515 VariationsHeaderHelper& operator=(const VariationsHeaderHelper&) = delete; 515 VariationsHeaderHelper& operator=(const VariationsHeaderHelper&) = delete;
516 516
517 bool AppendHeaderIfNeeded(const GURL& url, InIncognito incognito) { 517 bool AppendHeaderIfNeeded(const GURL& url, InIncognito incognito) {
@@ -533,8 +533,9 @@
533- if (variations_header_.empty()) 533- if (variations_header_.empty())
534- return false; 534- return false;
535- 535-
536- // Set the variations header to cors_exempt_headers rather than headers 536- // Set the variations header to cors_exempt_headers rather than headers to
537- // to be exempted from CORS checks. 537- // be exempted from CORS checks, and to avoid exposing the header to service
538- // workers.
538- resource_request_->cors_exempt_headers.SetHeaderIfMissing( 539- resource_request_->cors_exempt_headers.SetHeaderIfMissing(
539- kClientDataHeader, variations_header_); 540- kClientDataHeader, variations_header_);
540- return true; 541- return true;
@@ -542,7 +543,7 @@
542 } 543 }
543 544
544 private: 545 private:
545@@ -328,8 +302,6 @@ void RemoveVariationsHeaderIfNeeded( 546@@ -348,8 +321,6 @@ void RemoveVariationsHeaderIfNeeded(
546 const net::RedirectInfo& redirect_info, 547 const net::RedirectInfo& redirect_info,
547 const network::mojom::URLResponseHead& response_head, 548 const network::mojom::URLResponseHead& response_head,
548 std::vector<std::string>* to_be_removed_headers) { 549 std::vector<std::string>* to_be_removed_headers) {
@@ -551,13 +552,7 @@
551 } 552 }
552 553
553 std::unique_ptr<network::SimpleURLLoader> 554 std::unique_ptr<network::SimpleURLLoader>
554@@ -359,14 +331,11 @@ CreateSimpleURLLoaderWithVariationsHeade 555@@ -379,9 +350,7 @@ CreateSimpleURLLoaderWithVariationsHeade
555 }
556
557 bool IsVariationsHeader(const std::string& header_name) {
558- return header_name == kClientDataHeader ||
559- header_name == kOmniboxOnDeviceSuggestionsHeader;
560+ return false;
561 } 556 }
562 557
563 bool HasVariationsHeader(const network::ResourceRequest& request) { 558 bool HasVariationsHeader(const network::ResourceRequest& request) {
@@ -568,7 +563,7 @@
568 } 563 }
569 564
570 bool ShouldAppendVariationsHeaderForTesting( 565 bool ShouldAppendVariationsHeaderForTesting(
571@@ -377,12 +346,6 @@ bool ShouldAppendVariationsHeaderForTest 566@@ -392,12 +361,6 @@ bool ShouldAppendVariationsHeaderForTest
572 567
573 void UpdateCorsExemptHeaderForVariations( 568 void UpdateCorsExemptHeaderForVariations(
574 network::mojom::NetworkContextParams* params) { 569 network::mojom::NetworkContextParams* params) {
@@ -581,9 +576,9 @@
581 } 576 }
582 577
583 } // namespace variations 578 } // namespace variations
584--- net/base/url_util.cc.orig 579--- a/net/base/url_util.cc
585+++ net/base/url_util.cc 580+++ b/net/base/url_util.cc
586@@ -442,27 +442,6 @@ bool HasGoogleHost(const GURL& url) { 581@@ -455,27 +455,6 @@ bool HasGoogleHost(const GURL& url) {
587 } 582 }
588 583
589 bool IsGoogleHost(base::StringPiece host) { 584 bool IsGoogleHost(base::StringPiece host) {
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-mei-preload.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-mei-preload.patch
index 731e85d..a1ac146 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/disable-mei-preload.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-mei-preload.patch
@@ -5,9 +5,9 @@
5# is enough local data to determine the user's preferred behavior." This feature 5# is enough local data to determine the user's preferred behavior." This feature
6# does not seem to outweigh the benefit of removing the binary, thus this patch. 6# does not seem to outweigh the benefit of removing the binary, thus this patch.
7 7
8--- chrome/BUILD.gn.orig 8--- a/chrome/BUILD.gn
9+++ chrome/BUILD.gn 9+++ b/chrome/BUILD.gn
10@@ -351,7 +351,6 @@ if (!is_android && !is_mac) { 10@@ -346,7 +346,6 @@ if (!is_android && !is_mac) {
11 } 11 }
12 12
13 data_deps += [ 13 data_deps += [
@@ -15,8 +15,8 @@
15 "//third_party/widevine/cdm", 15 "//third_party/widevine/cdm",
16 ] 16 ]
17 } 17 }
18@@ -1157,7 +1156,6 @@ if (is_win) { 18@@ -1173,7 +1172,6 @@ if (is_win) {
19 ":keystone_registration_framework", 19 ":optimization_guide_library",
20 ":swiftshader_library", 20 ":swiftshader_library",
21 ":widevine_cdm_library", 21 ":widevine_cdm_library",
22- "//chrome/browser/resources/media/mei_preload:component_bundle", 22- "//chrome/browser/resources/media/mei_preload:component_bundle",
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-network-time-tracker.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-network-time-tracker.patch
index fb27026..9abf8db 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/disable-network-time-tracker.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-network-time-tracker.patch
@@ -3,9 +3,9 @@
3# date seems incorrect, according to https://bugs.chromium.org/p/chromium/issues/detail?id=725232, 3# date seems incorrect, according to https://bugs.chromium.org/p/chromium/issues/detail?id=725232,
4# Fixes https://github.com/Eloston/ungoogled-chromium/issues/302 4# Fixes https://github.com/Eloston/ungoogled-chromium/issues/302
5 5
6--- components/network_time/network_time_tracker.cc.orig 6--- a/components/network_time/network_time_tracker.cc
7+++ components/network_time/network_time_tracker.cc 7+++ b/components/network_time/network_time_tracker.cc
8@@ -277,7 +277,7 @@ void NetworkTimeTracker::UpdateNetworkTi 8@@ -273,7 +273,7 @@ void NetworkTimeTracker::UpdateNetworkTi
9 } 9 }
10 10
11 bool NetworkTimeTracker::AreTimeFetchesEnabled() const { 11 bool NetworkTimeTracker::AreTimeFetchesEnabled() const {
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch
index a4e7e8b..ad36006 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch
@@ -1,53 +1,87 @@
1--- chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc.orig 1--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
2+++ chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc 2+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
3@@ -378,7 +378,7 @@ std::vector<GURL> PrivacySandboxSettings 3@@ -85,21 +85,6 @@
4 }
5
6 bool PrivacySandboxSettings::IsPrivacySandboxAllowed() {
7- return pref_service_->GetBoolean(prefs::kPrivacySandboxApisEnabled);
8+ return false;
9 }
10
11 bool PrivacySandboxSettings::IsPrivacySandboxEnabled() {
12@@ -390,8 +390,6 @@ bool PrivacySandboxSettings::IsPrivacySa
13 }
14
15 void PrivacySandboxSettings::SetPrivacySandboxEnabled(bool enabled) {
16- pref_service_->SetBoolean(prefs::kPrivacySandboxManuallyControlled, true);
17- pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabled, enabled);
18 }
19
20 void PrivacySandboxSettings::OnCookiesCleared() {
21--- chrome/browser/resources/settings/privacy_page/privacy_page.html.orig
22+++ chrome/browser/resources/settings/privacy_page/privacy_page.html
23@@ -64,19 +64,6 @@
24 sub-label="$i18n{permissionsPageDescription}" 4 sub-label="$i18n{permissionsPageDescription}"
25 on-click="onPermissionsPageClick_" 5 on-click="onPermissionsPageClick_"
26 role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row> 6 role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
27- <cr-link-row id="privacySandboxLinkRow" 7- <template is="dom-if" if="[[!isPrivacySandboxRestricted_]]">
28- start-icon="settings20:experiment" 8- <cr-link-row id="privacySandboxLinkRow"
29- class="hr" 9- start-icon="settings20:experiment"
30- label="$i18n{privacySandboxTitle}" 10- class="hr"
31- sub-label="[[computePrivacySandboxSublabel_( 11- label="$i18n{privacySandboxTitle}"
32- prefs.privacy_sandbox.apis_enabled.*)]]" 12- sub-label="[[computePrivacySandboxSublabel_(
33- on-click="onPrivacySandboxClick_" 13- prefs.privacy_sandbox.*)]]"
34- external 14- on-click="onPrivacySandboxClick_"
35- role-description="$i18n{subpageArrowRoleDescription}"> 15- external
36- </cr-link-row> 16- role-description="$i18n{subpageArrowRoleDescription}">
37- <a id="privacySandboxLink" href="privacySandbox" 17- </cr-link-row>
38- target="_blank" tabindex="-1" aria-disabled="true" 18- <a id="privacySandboxLink" href="privacySandbox"
39- role="none"></a> 19- target="_blank" tabindex="-1" aria-disabled="true"
20- role="none"></a>
21- </template>
40 </div> 22 </div>
41 23
42 <if expr="use_nss_certs"> 24 <if expr="use_nss_certs">
43--- components/privacy_sandbox/privacy_sandbox_prefs.cc.orig 25--- a/components/privacy_sandbox/privacy_sandbox_prefs.cc
44+++ components/privacy_sandbox/privacy_sandbox_prefs.cc 26+++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc
45@@ -31,7 +31,7 @@ namespace privacy_sandbox { 27@@ -71,7 +71,7 @@ namespace privacy_sandbox {
46 28
47 void RegisterProfilePrefs(PrefRegistrySimple* registry) { 29 void RegisterProfilePrefs(PrefRegistrySimple* registry) {
48 registry->RegisterBooleanPref( 30 registry->RegisterBooleanPref(
49- prefs::kPrivacySandboxApisEnabled, true, 31- prefs::kPrivacySandboxApisEnabled, true,
50+ prefs::kPrivacySandboxApisEnabled, false, 32+ prefs::kPrivacySandboxApisEnabled, false,
51 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 33 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
52 registry->RegisterBooleanPref( 34 registry->RegisterBooleanPref(prefs::kPrivacySandboxApisEnabledV2, false);
53 prefs::kPrivacySandboxManuallyControlled, false, 35 registry->RegisterBooleanPref(prefs::kPrivacySandboxApisEnabledV2Init, false);
36--- a/components/privacy_sandbox/privacy_sandbox_settings.cc
37+++ b/components/privacy_sandbox/privacy_sandbox_settings.cc
38@@ -339,48 +339,10 @@ std::vector<GURL> PrivacySandboxSettings
39 }
40
41 bool PrivacySandboxSettings::IsPrivacySandboxEnabled() const {
42- // If the delegate is restricting access, or indicates confirmation has not
43- // occurred, the Privacy Sandbox is disabled.
44- if (delegate_->IsPrivacySandboxRestricted() ||
45- !delegate_->IsPrivacySandboxConfirmed()) {
46- return false;
47- }
48-
49- // For Measurement and Relevance APIs, we explicitly do not require the
50- // underlying pref to be enabled if there is a local flag enabling the APIs to
51- // allow for local testing.
52- bool should_override_setting_for_local_testing = base::FeatureList::IsEnabled(
53- privacy_sandbox::kOverridePrivacySandboxSettingsLocalTesting);
54-
55- // Which preference is consulted is dependent on whether release 3 of the
56- // settings is available.
57- if (base::FeatureList::IsEnabled(privacy_sandbox::kPrivacySandboxSettings3)) {
58- // For Privacy Sandbox Settings 3, APIs are disabled in incognito.
59- if (incognito_profile_)
60- return false;
61-
62- if (should_override_setting_for_local_testing) {
63- return true;
64- }
65-
66- // For Privacy Sandbox Settings 3, APIs may be restricted via the delegate.
67- // The V2 pref was introduced with the 3rd Privacy Sandbox release.
68- return pref_service_->GetBoolean(prefs::kPrivacySandboxApisEnabledV2);
69- }
70-
71- if (should_override_setting_for_local_testing)
72- return true;
73-
74- return pref_service_->GetBoolean(prefs::kPrivacySandboxApisEnabled);
75+ return false;
76 }
77
78 void PrivacySandboxSettings::SetPrivacySandboxEnabled(bool enabled) {
79- // Only apply the decision to the appropriate preference.
80- if (base::FeatureList::IsEnabled(privacy_sandbox::kPrivacySandboxSettings3)) {
81- pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabledV2, enabled);
82- } else {
83- pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabled, enabled);
84- }
85 }
86
87 bool PrivacySandboxSettings::IsTrustTokensAllowed() {
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-profile-avatar-downloading.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-profile-avatar-downloading.patch
index dee938a..279269e 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/disable-profile-avatar-downloading.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-profile-avatar-downloading.patch
@@ -1,7 +1,7 @@
1# Stop downloading of profile avatar (trk:271:...) 1# Stop downloading of profile avatar (trk:271:...)
2 2
3--- chrome/browser/profiles/profile_avatar_downloader.cc.orig 3--- a/chrome/browser/profiles/profile_avatar_downloader.cc
4+++ chrome/browser/profiles/profile_avatar_downloader.cc 4+++ b/chrome/browser/profiles/profile_avatar_downloader.cc
5@@ -27,8 +27,7 @@ ProfileAvatarDownloader::ProfileAvatarDo 5@@ -27,8 +27,7 @@ ProfileAvatarDownloader::ProfileAvatarDo
6 FetchCompleteCallback callback) 6 FetchCompleteCallback callback)
7 : icon_index_(icon_index), callback_(std::move(callback)) { 7 : icon_index_(icon_index), callback_(std::move(callback)) {
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-signin.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-signin.patch
index b2b6081..7e89e9d 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/disable-signin.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-signin.patch
@@ -1,8 +1,8 @@
1# Disables browser sign-in 1# Disables browser sign-in
2 2
3--- chrome/browser/ui/chrome_pages.cc.orig 3--- a/chrome/browser/ui/chrome_pages.cc
4+++ chrome/browser/ui/chrome_pages.cc 4+++ b/chrome/browser/ui/chrome_pages.cc
5@@ -480,32 +480,6 @@ GURL GetOSSettingsUrl(const std::string& 5@@ -520,32 +520,6 @@ GURL GetOSSettingsUrl(const std::string&
6 void ShowBrowserSignin(Browser* browser, 6 void ShowBrowserSignin(Browser* browser,
7 signin_metrics::AccessPoint access_point, 7 signin_metrics::AccessPoint access_point,
8 signin::ConsentLevel consent_level) { 8 signin::ConsentLevel consent_level) {
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-untraceable-urls.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-untraceable-urls.patch
index 612ec7d..59ea41b 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/disable-untraceable-urls.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-untraceable-urls.patch
@@ -1,7 +1,7 @@
1# Disable additional URLs that are not caught by the "trk" scheme 1# Disable additional URLs that are not caught by the "trk" scheme
2 2
3--- chrome/browser/plugins/plugins_resource_service.cc.orig 3--- a/chrome/browser/plugins/plugins_resource_service.cc
4+++ chrome/browser/plugins/plugins_resource_service.cc 4+++ b/chrome/browser/plugins/plugins_resource_service.cc
5@@ -53,9 +53,6 @@ const int kStartResourceFetchDelayMs = 6 5@@ -53,9 +53,6 @@ const int kStartResourceFetchDelayMs = 6
6 // Delay between calls to update the cache 1 day and 2 minutes in testing mode. 6 // Delay between calls to update the cache 1 day and 2 minutes in testing mode.
7 const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000; 7 const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000;
@@ -11,7 +11,7 @@
11- 11-
12 GURL GetPluginsServerURL() { 12 GURL GetPluginsServerURL() {
13 std::string filename; 13 std::string filename;
14 #if defined(OS_WIN) 14 #if BUILDFLAG(IS_WIN)
15@@ -70,7 +67,7 @@ GURL GetPluginsServerURL() { 15@@ -70,7 +67,7 @@ GURL GetPluginsServerURL() {
16 #error Unknown platform 16 #error Unknown platform
17 #endif 17 #endif
@@ -21,38 +21,9 @@
21 } 21 }
22 22
23 } // namespace 23 } // namespace
24--- components/safe_browsing/content/browser/client_side_model_loader.cc.orig 24--- a/rlz/lib/financial_ping.cc
25+++ components/safe_browsing/content/browser/client_side_model_loader.cc 25+++ b/rlz/lib/financial_ping.cc
26@@ -61,8 +61,6 @@ std::string ReadFileIntoString(base::Fil 26@@ -336,7 +336,7 @@ FinancialPing::PingResponse FinancialPin
27 // Model Loader strings
28 const size_t ModelLoader::kMaxModelSizeBytes = 150 * 1024;
29 const int ModelLoader::kClientModelFetchIntervalMs = 3600 * 1000;
30-const char ModelLoader::kClientModelUrlPrefix[] =
31- "https://ssl.gstatic.com/safebrowsing/csd/";
32 const char ModelLoader::kClientModelNamePattern[] =
33 "client_model_v5%s_variation_%d.pb";
34 #if !BUILDFLAG(FULL_SAFE_BROWSING)
35@@ -123,7 +121,7 @@ ModelLoader::ModelLoader(
36 scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
37 bool is_extended_reporting)
38 : name_(FillInModelName(is_extended_reporting, GetModelNumber())),
39- url_(kClientModelUrlPrefix + name_),
40+ url_("about:blank"),
41 update_renderers_callback_(update_renderers_callback),
42 url_loader_factory_(url_loader_factory),
43 last_client_model_status_(ClientModelStatus::MODEL_NEVER_FETCHED) {
44@@ -136,7 +134,7 @@ ModelLoader::ModelLoader(
45 scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
46 const std::string& model_name)
47 : name_(model_name),
48- url_(kClientModelUrlPrefix + name_),
49+ url_("about:blank"),
50 update_renderers_callback_(update_renderers_callback),
51 url_loader_factory_(url_loader_factory),
52 last_client_model_status_(ClientModelStatus::MODEL_NEVER_FETCHED) {
53--- rlz/lib/financial_ping.cc.orig
54+++ rlz/lib/financial_ping.cc
55@@ -338,7 +338,7 @@ FinancialPing::PingResponse FinancialPin
56 27
57 // Open network connection. 28 // Open network connection.
58 InternetHandle connection_handle = InternetConnectA(inet_handle, 29 InternetHandle connection_handle = InternetConnectA(inet_handle,
@@ -61,7 +32,7 @@
61 INTERNET_FLAG_NO_CACHE_WRITE, 0); 32 INTERNET_FLAG_NO_CACHE_WRITE, 0);
62 if (!connection_handle) 33 if (!connection_handle)
63 return PING_FAILURE; 34 return PING_FAILURE;
64@@ -382,7 +382,7 @@ FinancialPing::PingResponse FinancialPin 35@@ -380,7 +380,7 @@ FinancialPing::PingResponse FinancialPin
65 return PING_SUCCESSFUL; 36 return PING_SUCCESSFUL;
66 #else 37 #else
67 std::string url = 38 std::string url =
@@ -70,8 +41,8 @@
70 41
71 // Use a waitable event to cause this function to block, to match the 42 // Use a waitable event to cause this function to block, to match the
72 // wininet implementation. 43 // wininet implementation.
73--- rlz/lib/lib_values.cc.orig 44--- a/rlz/lib/lib_values.cc
74+++ rlz/lib/lib_values.cc 45+++ b/rlz/lib/lib_values.cc
75@@ -40,7 +40,6 @@ const char kSetDccResponseVariable[] = " 46@@ -40,7 +40,6 @@ const char kSetDccResponseVariable[] = "
76 // 47 //
77 48
@@ -80,8 +51,8 @@
80 const int kFinancialPort = 443; 51 const int kFinancialPort = 443;
81 52
82 // Ping times in 100-nanosecond intervals. 53 // Ping times in 100-nanosecond intervals.
83--- rlz/lib/lib_values.h.orig 54--- a/rlz/lib/lib_values.h
84+++ rlz/lib/lib_values.h 55+++ b/rlz/lib/lib_values.h
85@@ -72,7 +72,6 @@ extern const char kSetDccResponseVariabl 56@@ -72,7 +72,6 @@ extern const char kSetDccResponseVariabl
86 // 57 //
87 58
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch
index 9416c17..8efb360 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch
@@ -1,8 +1,8 @@
1# Disables WebRTC log uploading to Google 1# Disables WebRTC log uploading to Google
2 2
3--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 3--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
4+++ chrome/browser/media/webrtc/webrtc_log_uploader.cc 4+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
5@@ -127,28 +127,11 @@ void WebRtcLogUploader::LoggingStoppedDo 5@@ -126,28 +126,11 @@ void WebRtcLogUploader::LoggingStoppedDo
6 DCHECK(meta_data.get()); 6 DCHECK(meta_data.get());
7 DCHECK(!upload_done_data.paths.directory.empty()); 7 DCHECK(!upload_done_data.paths.directory.empty());
8 8
@@ -32,7 +32,7 @@
32 } 32 }
33 33
34 void WebRtcLogUploader::PrepareMultipartPostData( 34 void WebRtcLogUploader::PrepareMultipartPostData(
35@@ -159,28 +142,7 @@ void WebRtcLogUploader::PrepareMultipart 35@@ -158,28 +141,7 @@ void WebRtcLogUploader::PrepareMultipart
36 DCHECK(!compressed_log.empty()); 36 DCHECK(!compressed_log.empty());
37 DCHECK(meta_data.get()); 37 DCHECK(meta_data.get());
38 38
@@ -62,7 +62,7 @@
62 } 62 }
63 63
64 void WebRtcLogUploader::UploadStoredLog( 64 void WebRtcLogUploader::UploadStoredLog(
65@@ -246,49 +208,6 @@ void WebRtcLogUploader::LoggingStoppedDo 65@@ -245,49 +207,6 @@ void WebRtcLogUploader::LoggingStoppedDo
66 DCHECK(log_buffer.get()); 66 DCHECK(log_buffer.get());
67 DCHECK(!log_paths.directory.empty()); 67 DCHECK(!log_paths.directory.empty());
68 68
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-webstore-urls.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-webstore-urls.patch
index 8259c4d..060db05 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/disable-webstore-urls.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-webstore-urls.patch
@@ -1,8 +1,8 @@
1# Disables Chrome Webstore-related URLs and other internal functionality. Mainly for disabling auto updates via the Chrome Webstore. 1# Disables Chrome Webstore-related URLs and other internal functionality. Mainly for disabling auto updates via the Chrome Webstore.
2 2
3--- chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc.orig 3--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
4+++ chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc 4+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
5@@ -655,10 +655,6 @@ std::vector<url::Origin> ChromeContentBr 5@@ -555,10 +555,6 @@ std::vector<url::Origin> ChromeContentBr
6 GetOriginsRequiringDedicatedProcess() { 6 GetOriginsRequiringDedicatedProcess() {
7 std::vector<url::Origin> list; 7 std::vector<url::Origin> list;
8 8
@@ -13,9 +13,9 @@
13 return list; 13 return list;
14 } 14 }
15 15
16--- chrome/browser/extensions/chrome_content_verifier_delegate.cc.orig 16--- a/chrome/browser/extensions/chrome_content_verifier_delegate.cc
17+++ chrome/browser/extensions/chrome_content_verifier_delegate.cc 17+++ b/chrome/browser/extensions/chrome_content_verifier_delegate.cc
18@@ -288,17 +288,7 @@ bool ChromeContentVerifierDelegate::IsFr 18@@ -289,17 +289,7 @@ bool ChromeContentVerifierDelegate::IsFr
19 // between which extensions are considered in-store. 19 // between which extensions are considered in-store.
20 // See https://crbug.com/766806 for details. 20 // See https://crbug.com/766806 for details.
21 if (!InstallVerifier::IsFromStore(extension, context_)) { 21 if (!InstallVerifier::IsFromStore(extension, context_)) {
@@ -34,8 +34,8 @@
34 } 34 }
35 return true; 35 return true;
36 } 36 }
37--- chrome/browser/extensions/extension_migrator.cc.orig 37--- a/chrome/browser/extensions/extension_migrator.cc
38+++ chrome/browser/extensions/extension_migrator.cc 38+++ b/chrome/browser/extensions/extension_migrator.cc
39@@ -18,7 +18,9 @@ namespace extensions { 39@@ -18,7 +18,9 @@ namespace extensions {
40 ExtensionMigrator::ExtensionMigrator(Profile* profile, 40 ExtensionMigrator::ExtensionMigrator(Profile* profile,
41 const std::string& old_id, 41 const std::string& old_id,
@@ -56,27 +56,27 @@
56 56
57 prefs->SetKey(new_id_, base::Value::FromUniquePtrValue(std::move(entry))); 57 prefs->SetKey(new_id_, base::Value::FromUniquePtrValue(std::move(entry)));
58 } 58 }
59--- chrome/browser/extensions/extension_migrator.h.orig 59--- a/chrome/browser/extensions/extension_migrator.h
60+++ chrome/browser/extensions/extension_migrator.h 60+++ b/chrome/browser/extensions/extension_migrator.h
61@@ -9,6 +9,7 @@ 61@@ -9,6 +9,7 @@
62 62
63 #include "base/macros.h" 63 #include "base/memory/raw_ptr.h"
64 #include "chrome/browser/extensions/external_loader.h" 64 #include "chrome/browser/extensions/external_loader.h"
65+#include "url/gurl.h" 65+#include "url/gurl.h"
66 66
67 class Profile; 67 class Profile;
68 68
69@@ -40,6 +41,7 @@ class ExtensionMigrator : public Externa 69@@ -40,6 +41,7 @@ class ExtensionMigrator : public Externa
70 Profile* profile_; 70 raw_ptr<Profile> profile_;
71 const std::string old_id_; 71 const std::string old_id_;
72 const std::string new_id_; 72 const std::string new_id_;
73+ GURL chrome_blank_; 73+ GURL chrome_blank_;
74 }; 74 };
75 75
76 } // namespace extensions 76 } // namespace extensions
77--- extensions/browser/updater/extension_downloader.cc.orig 77--- a/extensions/browser/updater/extension_downloader.cc
78+++ extensions/browser/updater/extension_downloader.cc 78+++ b/extensions/browser/updater/extension_downloader.cc
79@@ -93,27 +93,18 @@ const char kNotFromWebstoreInstallSource 79@@ -92,27 +92,18 @@ const char kNotFromWebstoreInstallSource
80 const char kDefaultInstallSource[] = ""; 80 const char kDefaultInstallSource[] = "";
81 const char kReinstallInstallSource[] = "reinstall"; 81 const char kReinstallInstallSource[] = "reinstall";
82 82
@@ -106,47 +106,50 @@
106 106
107 bool ShouldRetryRequest(const network::SimpleURLLoader* loader) { 107 bool ShouldRetryRequest(const network::SimpleURLLoader* loader) {
108 DCHECK(loader); 108 DCHECK(loader);
109@@ -309,12 +300,6 @@ void ExtensionDownloader::DoStartAllPend 109@@ -377,10 +368,6 @@ void ExtensionDownloader::DoStartAllPend
110 ReportStats(); 110 }
111 url_stats_ = URLStats(); 111 pending_tasks_.clear();
112 112
113- for (auto it = fetches_preparing_.begin(); it != fetches_preparing_.end(); 113- for (auto& fetch_list : fetches_preparing) {
114- ++it) { 114- for (auto& fetch : fetch_list.second)
115- std::vector<std::unique_ptr<ManifestFetchData>>& list = it->second; 115- StartUpdateCheck(std::move(fetch));
116- for (size_t i = 0; i < list.size(); ++i)
117- StartUpdateCheck(std::move(list[i]));
118- } 116- }
119 fetches_preparing_.clear();
120 } 117 }
121 118
122@@ -353,11 +338,6 @@ bool ExtensionDownloader::AddExtensionDa 119 void ExtensionDownloader::SetIdentityManager(
123 return false; 120@@ -401,9 +388,7 @@ void ExtensionDownloader::SetBackoffPoli
124 }
125
126- // Make sure we use SSL for store-hosted extensions.
127- if (extension_urls::IsWebstoreUpdateUrl(update_url) &&
128- !update_url.SchemeIsCryptographic())
129- update_url = extension_urls::GetWebstoreUpdateUrl();
130-
131 // Skip extensions with empty IDs.
132 if (id.empty()) {
133 DLOG(WARNING) << "Found extension with empty ID";
134@@ -366,12 +346,10 @@ bool ExtensionDownloader::AddExtensionDa
135 return false;
136 }
137 121
122 void ExtensionDownloader::UpdateURLStats(const GURL& update_url,
123 Manifest::Type extension_type) {
138- if (update_url.DomainIs(kGoogleDotCom)) { 124- if (update_url.DomainIs(kGoogleDotCom)) {
139- url_stats_.google_url_count++; 125- url_stats_.google_url_count++;
140- } else if (update_url.is_empty()) { 126- } else if (update_url.is_empty()) {
141+ if (update_url.is_empty()) { 127+ if (update_url.is_empty()) {
142 url_stats_.no_url_count++; 128 url_stats_.no_url_count++;
143 // Fill in default update URL.
144- update_url = extension_urls::GetWebstoreUpdateUrl();
145+ update_url = GURL("chrome://blank/");
146 } else { 129 } else {
147 url_stats_.other_url_count++; 130 url_stats_.other_url_count++;
131@@ -440,11 +425,6 @@ bool ExtensionDownloader::AddExtensionDa
132 return false;
133 }
134
135- // Make sure we use SSL for store-hosted extensions.
136- if (extension_urls::IsWebstoreUpdateUrl(task.update_url) &&
137- !task.update_url.SchemeIsCryptographic())
138- task.update_url = extension_urls::GetWebstoreUpdateUrl();
139-
140 // Skip extensions with empty IDs.
141 if (task.id.empty()) {
142 DLOG(WARNING) << "Found extension with empty ID";
143@@ -455,7 +435,7 @@ bool ExtensionDownloader::AddExtensionDa
144 UpdateURLStats(task.update_url, task.type);
145 if (task.update_url.is_empty()) {
146 // Fill in default update URL.
147- task.update_url = extension_urls::GetWebstoreUpdateUrl();
148+ task.update_url = GURL("chrome://blank/");
148 } 149 }
149@@ -845,20 +823,6 @@ void ExtensionDownloader::HandleManifest 150
151 DCHECK(!task.update_url.is_empty());
152@@ -865,20 +845,6 @@ void ExtensionDownloader::HandleManifest
150 update->info); 153 update->info);
151 } 154 }
152 155
@@ -167,7 +170,7 @@
167 NotifyExtensionsDownloadStageChanged( 170 NotifyExtensionsDownloadStageChanged(
168 no_updates, ExtensionDownloaderDelegate::Stage::FINISHED); 171 no_updates, ExtensionDownloaderDelegate::Stage::FINISHED);
169 NotifyExtensionsDownloadFailed( 172 NotifyExtensionsDownloadFailed(
170@@ -1417,11 +1381,7 @@ bool ExtensionDownloader::IterateFetchCr 173@@ -1437,11 +1403,7 @@ bool ExtensionDownloader::IterateFetchCr
171 // fetch. 174 // fetch.
172 switch (fetch->credentials) { 175 switch (fetch->credentials) {
173 case ExtensionFetch::CREDENTIALS_NONE: 176 case ExtensionFetch::CREDENTIALS_NONE:
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/doh-changes.patch b/www/chromium-uc/patches/core/ungoogled-chromium/doh-changes.patch
index 4ee53be..9784907 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/doh-changes.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/doh-changes.patch
@@ -1,53 +1,59 @@
1--- chrome/common/chrome_features.cc.orig 1--- a/chrome/common/chrome_features.cc
2+++ chrome/common/chrome_features.cc 2+++ b/chrome/common/chrome_features.cc
3@@ -323,12 +323,7 @@ const base::Feature kDesktopPWAsWebBundl 3@@ -332,12 +332,7 @@ const base::Feature kKeepForceInstalledP
4 // Enable DNS over HTTPS (DoH). 4 // Enable DNS over HTTPS (DoH).
5 const base::Feature kDnsOverHttps { 5 const base::Feature kDnsOverHttps {
6 "DnsOverHttps", 6 "DnsOverHttps",
7-#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ 7-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
8- defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) 8- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
9- base::FEATURE_ENABLED_BY_DEFAULT 9- base::FEATURE_ENABLED_BY_DEFAULT
10-#else 10-#else
11 base::FEATURE_DISABLED_BY_DEFAULT 11 base::FEATURE_DISABLED_BY_DEFAULT
12-#endif 12-#endif
13 }; 13 };
14 14
15 // Provides a mechanism to remove providers from the dropdown list in the 15 // Set whether fallback to insecure DNS is allowed by default. This setting may
16--- net/dns/public/doh_provider_entry.cc.orig 16--- a/net/dns/public/doh_provider_entry.cc
17+++ net/dns/public/doh_provider_entry.cc 17+++ b/net/dns/public/doh_provider_entry.cc
18@@ -117,24 +117,6 @@ const DohProviderEntry::List& DohProvide 18@@ -149,30 +149,6 @@ const DohProviderEntry::List& DohProvide
19 /*privacy_policy=*/"https://dns.sb/privacy/",
20 /*display_globally=*/false, /*display_countries=*/{"EE", "DE"}, 19 /*display_globally=*/false, /*display_countries=*/{"EE", "DE"},
21 LoggingLevel::kNormal), 20 LoggingLevel::kNormal),
22- new DohProviderEntry("Google", DohProviderIdForHistogram::kGoogle, 21 new DohProviderEntry(
23- {"8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", 22- "Google",
24- "2001:4860:4860::8844"}, 23- base::Feature{"DohProviderGoogle", base::FEATURE_ENABLED_BY_DEFAULT},
25- {"dns.google", "dns.google.com", 24- DohProviderIdForHistogram::kGoogle,
26- "8888.google"} /* dns_over_tls_hostnames */, 25- {"8.8.8.8", "8.8.4.4", "2001:4860:4860::8888",
27- "https://dns.google/dns-query{?dns}", 26- "2001:4860:4860::8844"},
28- "Google (Public DNS)" /* ui_name */, 27- /*dns_over_tls_hostnames=*/
29- "https://developers.google.com/speed/public-dns/" 28- {"dns.google", "dns.google.com", "8888.google"},
30- "privacy" /* privacy_policy */, 29- "https://dns.google/dns-query{?dns}",
31- true /* display_globally */, 30- /*ui_name=*/"Google (Public DNS)",
32- {} /* display_countries */, LoggingLevel::kExtra), 31- "https://developers.google.com/speed/public-dns/"
32- /*privacy_policy=*/"privacy",
33- /*display_globally=*/true, /*display_countries=*/{},
34- LoggingLevel::kExtra),
35- new DohProviderEntry("GoogleDns64",
36- base::Feature{"DohProviderGoogleDns64",
37- base::FEATURE_ENABLED_BY_DEFAULT},
38- /*provider_id_for_histogram=*/absl::nullopt,
39- {"2001:4860:4860::64", "2001:4860:4860::6464"},
40- /*dns_over_tls_hostnames=*/{"dns64.dns.google"},
41- "https://dns64.dns.google/dns-query{?dns}",
42- /*ui_name=*/"", /*privacy_policy=*/"",
43- /*display_globally=*/false,
44- /*display_countries=*/{}, LoggingLevel::kNormal),
33- new DohProviderEntry( 45- new DohProviderEntry(
34- "GoogleDns64", absl::nullopt /* provider_id_for_histogram */, 46 "Iij",
35- {"2001:4860:4860::64", "2001:4860:4860::6464"}, 47 base::Feature{"DohProviderIij", base::FEATURE_ENABLED_BY_DEFAULT},
36- {"dns64.dns.google"} /* dns_over_tls_hostnames */, 48 DohProviderIdForHistogram::kIij, /*ip_strs=*/{},
37- "https://dns64.dns.google/dns-query{?dns}", "" /* ui_name */, 49--- a/services/network/public/cpp/features.cc
38- "" /* privacy_policy */, false /* display_globally */, 50+++ b/services/network/public/cpp/features.cc
39- {} /* display_countries */, LoggingLevel::kNormal), 51@@ -92,12 +92,7 @@ const base::Feature kSplitAuthCacheByNet
40 new DohProviderEntry("Iij", DohProviderIdForHistogram::kIij,
41 {} /* ip_strs */, {} /* dns_over_tls_hostnames */,
42 "https://public.dns.iij.jp/dns-query",
43--- services/network/public/cpp/features.cc.orig
44+++ services/network/public/cpp/features.cc
45@@ -114,12 +114,7 @@ const base::Feature kSplitAuthCacheByNet
46 // Enable usage of hardcoded DoH upgrade mapping for use in automatic mode. 52 // Enable usage of hardcoded DoH upgrade mapping for use in automatic mode.
47 const base::Feature kDnsOverHttpsUpgrade { 53 const base::Feature kDnsOverHttpsUpgrade {
48 "DnsOverHttpsUpgrade", 54 "DnsOverHttpsUpgrade",
49-#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_ANDROID) || \ 55-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
50- defined(OS_WIN) 56- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
51- base::FEATURE_ENABLED_BY_DEFAULT 57- base::FEATURE_ENABLED_BY_DEFAULT
52-#else 58-#else
53 base::FEATURE_DISABLED_BY_DEFAULT 59 base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch b/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch
index 16b7351..da8bcc8 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch
@@ -1,9 +1,9 @@
1# Contains tests and features that are unneeded and would otherwise 1# Contains tests and features that are unneeded and would otherwise
2# require binaries to be whitelisted in the pruning list 2# require binaries to be whitelisted in the pruning list
3 3
4--- chrome/test/chromedriver/BUILD.gn.orig 4--- a/chrome/test/chromedriver/BUILD.gn
5+++ chrome/test/chromedriver/BUILD.gn 5+++ b/chrome/test/chromedriver/BUILD.gn
6@@ -311,11 +311,7 @@ source_set("lib") { 6@@ -335,11 +335,7 @@ source_set("lib") {
7 } 7 }
8 } 8 }
9 9
@@ -15,7 +15,7 @@
15 15
16 executable("$chromedriver_output") { 16 executable("$chromedriver_output") {
17 testonly = true 17 testonly = true
18@@ -337,16 +333,6 @@ executable("$chromedriver_output") { 18@@ -361,16 +357,6 @@ executable("$chromedriver_output") {
19 } 19 }
20 } 20 }
21 21
@@ -32,11 +32,11 @@
32 python_library("chromedriver_py_tests") { 32 python_library("chromedriver_py_tests") {
33 testonly = true 33 testonly = true
34 deps = [ 34 deps = [
35--- third_party/devtools-frontend/src/BUILD.gn.orig 35--- a/third_party/devtools-frontend/src/BUILD.gn
36+++ third_party/devtools-frontend/src/BUILD.gn 36+++ b/third_party/devtools-frontend/src/BUILD.gn
37@@ -136,7 +136,6 @@ foreach(module_file, non_autostart_non_r 37@@ -13,7 +13,6 @@ import("./third_party/blink/public/publi
38
38 devtools_frontend_resources_deps = [ 39 devtools_frontend_resources_deps = [
39 ":build_release_devtools",
40 "front_end", 40 "front_end",
41- "test", 41- "test",
42 ] 42 ]
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch b/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch
deleted file mode 100644
index f86694a..0000000
--- a/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch
+++ /dev/null
@@ -1,215 +0,0 @@
1--- content/browser/BUILD.gn.orig
2+++ content/browser/BUILD.gn
3@@ -1274,6 +1274,10 @@ source_set("browser") {
4 "net/browser_online_state_observer.cc",
5 "net/browser_online_state_observer.h",
6 "net/cookie_store_factory.cc",
7+ "net/cross_origin_embedder_policy_reporter.cc",
8+ "net/cross_origin_embedder_policy_reporter.h",
9+ "net/cross_origin_opener_policy_reporter.cc",
10+ "net/cross_origin_opener_policy_reporter.h",
11 "net/network_errors_listing_ui.cc",
12 "net/network_errors_listing_ui.h",
13 "net/network_quality_observer_impl.cc",
14@@ -3034,10 +3038,6 @@ source_set("browser") {
15
16 if (enable_reporting) {
17 sources += [
18- "net/cross_origin_embedder_policy_reporter.cc",
19- "net/cross_origin_embedder_policy_reporter.h",
20- "net/cross_origin_opener_policy_reporter.cc",
21- "net/cross_origin_opener_policy_reporter.h",
22 "net/reporting_service_proxy.cc",
23 "net/reporting_service_proxy.h",
24 ]
25--- content/browser/devtools/protocol/network_handler.h.orig
26+++ content/browser/devtools/protocol/network_handler.h
27@@ -309,8 +309,10 @@ class NetworkHandler : public DevToolsDo
28 Response response,
29 mojo::ScopedDataPipeConsumerHandle pipe,
30 const std::string& mime_type);
31+#if BUILDFLAG(ENABLE_REPORTING)
32 std::unique_ptr<protocol::Network::ReportingApiReport> BuildProtocolReport(
33 const net::ReportingReport& report);
34+#endif
35
36 // TODO(dgozman): Remove this.
37 const std::string host_id_;
38--- content/public/common/content_switch_dependent_feature_overrides.cc.orig
39+++ content/public/common/content_switch_dependent_feature_overrides.cc
40@@ -40,9 +40,11 @@ GetSwitchDependentFeatureOverrides(const
41 {switches::kEnableExperimentalWebPlatformFeatures,
42 std::cref(features::kDocumentPolicyNegotiation),
43 base::FeatureList::OVERRIDE_ENABLE_FEATURE},
44+#if BUILDFLAG(ENABLE_REPORTING)
45 {switches::kEnableExperimentalWebPlatformFeatures,
46 std::cref(net::features::kDocumentReporting),
47 base::FeatureList::OVERRIDE_ENABLE_FEATURE},
48+#endif
49 {switches::kEnableExperimentalWebPlatformFeatures,
50 std::cref(features::kExperimentalContentSecurityPolicyFeatures),
51 base::FeatureList::OVERRIDE_ENABLE_FEATURE},
52--- services/network/network_context.cc.orig
53+++ services/network/network_context.cc
54@@ -1140,6 +1140,11 @@ void NetworkContext::QueueSignedExchange
55 const net::NetworkIsolationKey& network_isolation_key) {
56 NOTREACHED();
57 }
58+
59+void NetworkContext::AddReportingApiObserver(
60+ mojo::PendingRemote<network::mojom::ReportingApiObserver> observer) {
61+ NOTREACHED();
62+}
63 #endif // BUILDFLAG(ENABLE_REPORTING)
64
65 void NetworkContext::ClearDomainReliability(
66--- services/network/network_context.h.orig
67+++ services/network/network_context.h
68@@ -570,10 +570,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE)
69 return require_network_isolation_key_;
70 }
71
72-#if BUILDFLAG(ENABLE_REPORTING)
73 void AddReportingApiObserver(
74 mojo::PendingRemote<network::mojom::ReportingApiObserver> observer)
75 override;
76+#if BUILDFLAG(ENABLE_REPORTING)
77 void OnReportAdded(const net::ReportingReport* service_report) override;
78 void OnReportUpdated(const net::ReportingReport* service_report) override;
79 void OnReportingObserverDisconnect(mojo::RemoteSetElementId mojo_id);
80--- third_party/blink/renderer/core/frame/local_frame.cc.orig
81+++ third_party/blink/renderer/core/frame/local_frame.cc
82@@ -39,6 +39,7 @@
83 #include "base/values.h"
84 #include "mojo/public/cpp/bindings/self_owned_receiver.h"
85 #include "mojo/public/cpp/system/message_pipe.h"
86+#include "net/net_buildflags.h"
87 #include "services/data_decoder/public/mojom/resource_snapshot_for_web_bundle.mojom-blink.h"
88 #include "services/network/public/cpp/features.h"
89 #include "services/network/public/mojom/content_security_policy.mojom-blink.h"
90@@ -2304,9 +2305,11 @@ const base::UnguessableToken& LocalFrame
91 return base::UnguessableToken::Null();
92 }
93
94+#if BUILDFLAG(ENABLE_REPORTING)
95 mojom::blink::ReportingServiceProxy* LocalFrame::GetReportingService() {
96 return mojo_handler_->ReportingService();
97 }
98+#endif
99
100 // static
101 void LocalFrame::NotifyUserActivation(
102--- third_party/blink/renderer/core/frame/local_frame.h.orig
103+++ third_party/blink/renderer/core/frame/local_frame.h
104@@ -37,6 +37,7 @@
105 #include "build/build_config.h"
106 #include "mojo/public/cpp/bindings/pending_associated_receiver.h"
107 #include "mojo/public/cpp/bindings/pending_receiver.h"
108+#include "net/net_buildflags.h"
109 #include "services/device/public/mojom/device_posture_provider.mojom-blink-forward.h"
110 #include "services/network/public/mojom/fetch_api.mojom-blink-forward.h"
111 #include "third_party/blink/public/common/frame/frame_ad_evidence.h"
112@@ -546,7 +547,9 @@ class CORE_EXPORT LocalFrame final : pub
113
114 SmoothScrollSequencer& GetSmoothScrollSequencer();
115
116+#if BUILDFLAG(ENABLE_REPORTING)
117 mojom::blink::ReportingServiceProxy* GetReportingService();
118+#endif
119
120 // Returns the frame host ptr. The interface returned is backed by an
121 // associated interface with the legacy Chrome IPC channel.
122--- third_party/blink/renderer/core/frame/reporting_context.cc.orig
123+++ third_party/blink/renderer/core/frame/reporting_context.cc
124@@ -4,6 +4,7 @@
125
126 #include "third_party/blink/renderer/core/frame/reporting_context.h"
127
128+#include "net/net_buildflags.h"
129 #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
130 #include "third_party/blink/public/platform/platform.h"
131 #include "third_party/blink/public/platform/task_type.h"
132@@ -54,7 +55,9 @@ const char ReportingContext::kSupplement
133 ReportingContext::ReportingContext(ExecutionContext& context)
134 : Supplement<ExecutionContext>(context),
135 execution_context_(context),
136+#if BUILDFLAG(ENABLE_REPORTING)
137 reporting_service_(&context),
138+#endif
139 receiver_(this, &context) {}
140
141 // static
142@@ -118,7 +121,9 @@ void ReportingContext::Trace(Visitor* vi
143 visitor->Trace(observers_);
144 visitor->Trace(report_buffer_);
145 visitor->Trace(execution_context_);
146+#if BUILDFLAG(ENABLE_REPORTING)
147 visitor->Trace(reporting_service_);
148+#endif
149 visitor->Trace(receiver_);
150 Supplement<ExecutionContext>::Trace(visitor);
151 }
152@@ -140,6 +145,7 @@ void ReportingContext::CountReport(Repor
153 UseCounter::Count(execution_context_, feature);
154 }
155
156+#if BUILDFLAG(ENABLE_REPORTING)
157 const HeapMojoRemote<mojom::blink::ReportingServiceProxy>&
158 ReportingContext::GetReportingService() const {
159 if (!reporting_service_.is_bound()) {
160@@ -149,6 +155,7 @@ ReportingContext::GetReportingService()
161 }
162 return reporting_service_;
163 }
164+#endif
165
166 void ReportingContext::NotifyInternal(Report* report) {
167 // Buffer the report.
168@@ -171,6 +178,7 @@ void ReportingContext::NotifyInternal(Re
169
170 void ReportingContext::SendToReportingAPI(Report* report,
171 const String& endpoint) const {
172+#if BUILDFLAG(ENABLE_REPORTING)
173 const String& type = report->type();
174 if (!(type == ReportType::kCSPViolation || type == ReportType::kDeprecation ||
175 type == ReportType::kPermissionsPolicyViolation ||
176@@ -226,6 +234,7 @@ void ReportingContext::SendToReportingAP
177 url, endpoint, body->featureId(), body->disposition(), body->message(),
178 body->sourceFile(), line_number, column_number);
179 }
180+#endif
181 }
182
183 } // namespace blink
184--- third_party/blink/renderer/core/frame/reporting_context.h.orig
185+++ third_party/blink/renderer/core/frame/reporting_context.h
186@@ -5,6 +5,7 @@
187 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_REPORTING_CONTEXT_H_
188 #define THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_REPORTING_CONTEXT_H_
189
190+#include "net/net_buildflags.h"
191 #include "third_party/blink/public/mojom/frame/reporting_observer.mojom-blink.h"
192 #include "third_party/blink/public/mojom/reporting/reporting.mojom-blink.h"
193 #include "third_party/blink/renderer/core/core_export.h"
194@@ -54,8 +55,10 @@ class CORE_EXPORT ReportingContext : pub
195 // Counts the use of a report type via UseCounter.
196 void CountReport(Report*);
197
198+#if BUILDFLAG(ENABLE_REPORTING)
199 const HeapMojoRemote<mojom::blink::ReportingServiceProxy>&
200 GetReportingService() const;
201+#endif
202
203 void NotifyInternal(Report* report);
204 // Send |report| via the Reporting API to |endpoint|.
205@@ -67,8 +70,10 @@ class CORE_EXPORT ReportingContext : pub
206
207 // This is declared mutable so that the service endpoint can be cached by
208 // const methods.
209+#if BUILDFLAG(ENABLE_REPORTING)
210 mutable HeapMojoRemote<mojom::blink::ReportingServiceProxy>
211 reporting_service_;
212+#endif
213
214 HeapMojoReceiver<mojom::blink::ReportingObserver, ReportingContext> receiver_;
215 };
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch b/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch
index 17b383f..c3c4de2 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch
@@ -1,7 +1,7 @@
1# Fix building without one click signin 1# Fix building without one click signin
2 2
3--- chrome/browser/ui/sync/one_click_signin_links_delegate_impl.cc.orig 3--- a/chrome/browser/ui/sync/one_click_signin_links_delegate_impl.cc
4+++ chrome/browser/ui/sync/one_click_signin_links_delegate_impl.cc 4+++ b/chrome/browser/ui/sync/one_click_signin_links_delegate_impl.cc
5@@ -16,9 +16,4 @@ OneClickSigninLinksDelegateImpl::OneClic 5@@ -16,9 +16,4 @@ OneClickSigninLinksDelegateImpl::OneClic
6 OneClickSigninLinksDelegateImpl::~OneClickSigninLinksDelegateImpl() {} 6 OneClickSigninLinksDelegateImpl::~OneClickSigninLinksDelegateImpl() {}
7 7
@@ -12,17 +12,17 @@
12- : WindowOpenDisposition::NEW_FOREGROUND_TAB; 12- : WindowOpenDisposition::NEW_FOREGROUND_TAB;
13- Navigate(&params); 13- Navigate(&params);
14 } 14 }
15--- chrome/browser/ui/webui/signin/inline_login_handler_impl.cc.orig 15--- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
16+++ chrome/browser/ui/webui/signin/inline_login_handler_impl.cc 16+++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
17@@ -360,6 +360,7 @@ void InlineSigninHelper::OnClientOAuthSu 17@@ -343,6 +343,7 @@ void InlineSigninHelper::OnClientOAuthSu
18 void InlineSigninHelper::OnClientOAuthSuccessAndBrowserOpened(
18 const ClientOAuthResult& result, 19 const ClientOAuthResult& result,
19 Profile* /*profile*/, 20 Profile* /*profile*/) {
20 Profile::CreateStatus /*status*/) {
21+#if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN) 21+#if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN)
22 HandlerSigninReason reason = GetHandlerSigninReason(current_url_); 22 HandlerSigninReason reason = GetHandlerSigninReason(current_url_);
23 if (reason == HandlerSigninReason::kFetchLstOnly) { 23 if (reason == HandlerSigninReason::kFetchLstOnly) {
24 // Constants are only available on Windows for the Google Credential 24 // Constants are only available on Windows for the Google Credential
25@@ -436,6 +437,7 @@ void InlineSigninHelper::OnClientOAuthSu 25@@ -419,6 +420,7 @@ void InlineSigninHelper::OnClientOAuthSu
26 } 26 }
27 27
28 base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this); 28 base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch b/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch
index d71a532..b1200f9 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch
@@ -1,8 +1,17 @@
1# Additional changes to Inox's fix-building-without-safebrowsing.patch 1# Additional changes to Inox's fix-building-without-safebrowsing.patch
2 2
3--- chrome/browser/BUILD.gn.orig 3--- a/chrome/browser/BUILD.gn
4+++ chrome/browser/BUILD.gn 4+++ b/chrome/browser/BUILD.gn
5@@ -1953,7 +1953,6 @@ static_library("browser") { 5@@ -615,8 +615,6 @@ static_library("browser") {
6 "internal_auth.h",
7 "interstitials/chrome_settings_page_helper.cc",
8 "interstitials/chrome_settings_page_helper.h",
9- "interstitials/enterprise_util.cc",
10- "interstitials/enterprise_util.h",
11 "invalidation/profile_invalidation_provider_factory.cc",
12 "invalidation/profile_invalidation_provider_factory.h",
13 "language/language_model_manager_factory.cc",
14@@ -1960,7 +1958,6 @@ static_library("browser") {
6 "//chrome/browser/net:probe_message_proto", 15 "//chrome/browser/net:probe_message_proto",
7 "//chrome/browser/new_tab_page/modules/drive:mojo_bindings", 16 "//chrome/browser/new_tab_page/modules/drive:mojo_bindings",
8 "//chrome/browser/new_tab_page/modules/photos:mojo_bindings", 17 "//chrome/browser/new_tab_page/modules/photos:mojo_bindings",
@@ -10,17 +19,18 @@
10 "//chrome/browser/new_tab_page/modules/task_module:mojo_bindings", 19 "//chrome/browser/new_tab_page/modules/task_module:mojo_bindings",
11 "//chrome/browser/notifications", 20 "//chrome/browser/notifications",
12 "//chrome/browser/notifications/scheduler:factory", 21 "//chrome/browser/notifications/scheduler:factory",
13@@ -3726,9 +3725,6 @@ static_library("browser") { 22@@ -3774,10 +3771,6 @@ static_library("browser") {
14 "download/offline_item_model_manager_factory.h", 23 "download/offline_item_model_manager_factory.h",
15 "enterprise/connectors/analysis/analysis_service_settings.cc", 24 "enterprise/connectors/analysis/analysis_service_settings.cc",
16 "enterprise/connectors/analysis/analysis_service_settings.h", 25 "enterprise/connectors/analysis/analysis_service_settings.h",
17- "enterprise/connectors/analysis/content_analysis_delegate.cc", 26- "enterprise/connectors/analysis/content_analysis_delegate.cc",
18- "enterprise/connectors/analysis/content_analysis_delegate.h", 27- "enterprise/connectors/analysis/content_analysis_delegate.h",
28- "enterprise/connectors/analysis/content_analysis_delegate_base.cc",
19- "enterprise/connectors/analysis/content_analysis_delegate_base.h", 29- "enterprise/connectors/analysis/content_analysis_delegate_base.h",
20 "enterprise/connectors/analysis/content_analysis_dialog.cc", 30 "enterprise/connectors/analysis/content_analysis_dialog.cc",
21 "enterprise/connectors/analysis/content_analysis_dialog.h", 31 "enterprise/connectors/analysis/content_analysis_dialog.h",
22 "enterprise/connectors/analysis/content_analysis_downloads_delegate.cc", 32 "enterprise/connectors/analysis/content_analysis_downloads_delegate.cc",
23@@ -3978,10 +3974,6 @@ static_library("browser") { 33@@ -4024,10 +4017,6 @@ static_library("browser") {
24 "new_tab_page/modules/photos/photos_service.h", 34 "new_tab_page/modules/photos/photos_service.h",
25 "new_tab_page/modules/photos/photos_service_factory.cc", 35 "new_tab_page/modules/photos/photos_service_factory.cc",
26 "new_tab_page/modules/photos/photos_service_factory.h", 36 "new_tab_page/modules/photos/photos_service_factory.h",
@@ -31,7 +41,7 @@
31 "new_tab_page/modules/task_module/task_module_handler.cc", 41 "new_tab_page/modules/task_module/task_module_handler.cc",
32 "new_tab_page/modules/task_module/task_module_handler.h", 42 "new_tab_page/modules/task_module/task_module_handler.h",
33 "new_tab_page/modules/task_module/task_module_service.cc", 43 "new_tab_page/modules/task_module/task_module_service.cc",
34@@ -7012,9 +7004,14 @@ static_library("browser") { 44@@ -7380,9 +7369,14 @@ static_library("browser") {
35 "//components/safe_browsing/content/browser:safe_browsing_blocking_page", 45 "//components/safe_browsing/content/browser:safe_browsing_blocking_page",
36 "//components/safe_browsing/content/browser/download:download_stats", 46 "//components/safe_browsing/content/browser/download:download_stats",
37 "//components/safe_browsing/content/common:file_type_policies", 47 "//components/safe_browsing/content/common:file_type_policies",
@@ -47,8 +57,8 @@
47 57
48 if (!is_fuchsia) { 58 if (!is_fuchsia) {
49 sources += [ 59 sources += [
50--- chrome/browser/accuracy_tips/accuracy_service_factory.cc.orig 60--- a/chrome/browser/accuracy_tips/accuracy_service_factory.cc
51+++ chrome/browser/accuracy_tips/accuracy_service_factory.cc 61+++ b/chrome/browser/accuracy_tips/accuracy_service_factory.cc
52@@ -48,10 +48,7 @@ KeyedService* AccuracyServiceFactory::Bu 62@@ -48,10 +48,7 @@ KeyedService* AccuracyServiceFactory::Bu
53 content::BrowserContext* browser_context) const { 63 content::BrowserContext* browser_context) const {
54 DCHECK(base::FeatureList::IsEnabled(safe_browsing::kAccuracyTipsFeature)); 64 DCHECK(base::FeatureList::IsEnabled(safe_browsing::kAccuracyTipsFeature));
@@ -61,9 +71,9 @@
61 auto* history_service = HistoryServiceFactory::GetForProfile( 71 auto* history_service = HistoryServiceFactory::GetForProfile(
62 profile, ServiceAccessType::IMPLICIT_ACCESS); 72 profile, ServiceAccessType::IMPLICIT_ACCESS);
63 auto delegate = std::make_unique<AccuracyServiceDelegate>(profile); 73 auto delegate = std::make_unique<AccuracyServiceDelegate>(profile);
64--- chrome/browser/chrome_content_browser_client.cc.orig 74--- a/chrome/browser/chrome_content_browser_client.cc
65+++ chrome/browser/chrome_content_browser_client.cc 75+++ b/chrome/browser/chrome_content_browser_client.cc
66@@ -4229,11 +4229,13 @@ ChromeContentBrowserClient::CreateThrott 76@@ -4298,11 +4298,13 @@ ChromeContentBrowserClient::CreateThrott
67 &throttles); 77 &throttles);
68 #endif 78 #endif
69 79
@@ -77,7 +87,7 @@
77 87
78 // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch 88 // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
79 // of lacros-chrome is complete. 89 // of lacros-chrome is complete.
80@@ -5632,26 +5634,7 @@ ChromeContentBrowserClient::GetSafeBrows 90@@ -5699,26 +5701,7 @@ ChromeContentBrowserClient::GetSafeBrows
81 const std::vector<std::string>& allowlist_domains) { 91 const std::vector<std::string>& allowlist_domains) {
82 DCHECK_CURRENTLY_ON(BrowserThread::IO); 92 DCHECK_CURRENTLY_ON(BrowserThread::IO);
83 93
@@ -105,7 +115,7 @@
105 } 115 }
106 116
107 safe_browsing::RealTimeUrlLookupServiceBase* 117 safe_browsing::RealTimeUrlLookupServiceBase*
108@@ -5672,11 +5655,6 @@ ChromeContentBrowserClient::GetUrlLookup 118@@ -5739,11 +5722,6 @@ ChromeContentBrowserClient::GetUrlLookup
109 GetForProfile(profile); 119 GetForProfile(profile);
110 } 120 }
111 #endif 121 #endif
@@ -117,9 +127,9 @@
117 return nullptr; 127 return nullptr;
118 } 128 }
119 129
120--- chrome/browser/chrome_content_browser_client_receiver_bindings.cc.orig 130--- a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
121+++ chrome/browser/chrome_content_browser_client_receiver_bindings.cc 131+++ b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
122@@ -139,45 +139,6 @@ void MaybeCreateSafeBrowsingForRenderer( 132@@ -143,34 +143,6 @@ void MaybeCreateSafeBrowsingForRenderer(
123 const std::vector<std::string>& allowlist_domains)> 133 const std::vector<std::string>& allowlist_domains)>
124 get_checker_delegate, 134 get_checker_delegate,
125 mojo::PendingReceiver<safe_browsing::mojom::SafeBrowsing> receiver) { 135 mojo::PendingReceiver<safe_browsing::mojom::SafeBrowsing> receiver) {
@@ -137,17 +147,6 @@
137- std::vector<std::string> allowlist_domains = 147- std::vector<std::string> allowlist_domains =
138- safe_browsing::GetURLAllowlistByPolicy(pref_service); 148- safe_browsing::GetURLAllowlistByPolicy(pref_service);
139- 149-
140- // Log the size of the domains to make sure copying them is
141- // not too expensive.
142- if (allowlist_domains.size() > 0) {
143- int total_size = 0;
144- for (const auto& domains : allowlist_domains) {
145- total_size += domains.size();
146- }
147- base::UmaHistogramCounts10000(
148- "SafeBrowsing.Policy.AllowlistDomainsTotalSize", total_size);
149- }
150-
151- bool safe_browsing_enabled = 150- bool safe_browsing_enabled =
152- safe_browsing::IsSafeBrowsingEnabled(*pref_service); 151- safe_browsing::IsSafeBrowsingEnabled(*pref_service);
153- content::GetIOThreadTaskRunner({})->PostTask( 152- content::GetIOThreadTaskRunner({})->PostTask(
@@ -165,9 +164,9 @@
165 } 164 }
166 165
167 // BadgeManager is not used for Android. 166 // BadgeManager is not used for Android.
168--- chrome/browser/component_updater/client_side_phishing_component_installer.cc.orig 167--- a/chrome/browser/component_updater/chrome_client_side_phishing_component_installer.cc
169+++ chrome/browser/component_updater/client_side_phishing_component_installer.cc 168+++ b/chrome/browser/component_updater/chrome_client_side_phishing_component_installer.cc
170@@ -36,20 +36,6 @@ const char kClientSidePhishingManifestNa 169@@ -29,20 +29,6 @@ namespace {
171 170
172 void LoadFromDisk(const base::FilePath& pb_path, 171 void LoadFromDisk(const base::FilePath& pb_path,
173 const base::FilePath& visual_tflite_model_path) { 172 const base::FilePath& visual_tflite_model_path) {
@@ -187,9 +186,9 @@
187- ->PopulateFromDynamicUpdate(binary_pb, std::move(visual_tflite_model)); 186- ->PopulateFromDynamicUpdate(binary_pb, std::move(visual_tflite_model));
188 } 187 }
189 188
190 base::FilePath GetInstalledProtoPath(const base::FilePath& base) { 189 void PopulateModelFromFiles(const base::FilePath& install_dir) {
191@@ -123,9 +109,6 @@ update_client::InstallerAttributes 190@@ -56,9 +42,6 @@ void PopulateModelFromFiles(const base::
192 ClientSidePhishingComponentInstallerPolicy::GetInstallerAttributes() const { 191 update_client::InstallerAttributes GetInstallerAttributes() {
193 update_client::InstallerAttributes attributes; 192 update_client::InstallerAttributes attributes;
194 193
195- // Pass the tag parameter to the installer as the "tag" attribute; it will 194- // Pass the tag parameter to the installer as the "tag" attribute; it will
@@ -198,9 +197,19 @@
198 return attributes; 197 return attributes;
199 } 198 }
200 199
201--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 200--- a/chrome/browser/devtools/devtools_window.cc
202+++ chrome/browser/download/chrome_download_manager_delegate.cc 201+++ b/chrome/browser/devtools/devtools_window.cc
203@@ -135,7 +135,6 @@ using content::DownloadManager; 202@@ -70,6 +70,7 @@
203 #include "content/public/common/content_client.h"
204 #include "content/public/common/url_constants.h"
205 #include "net/base/escape.h"
206+#include "net/cert/x509_certificate.h"
207 #include "third_party/blink/public/common/input/web_gesture_event.h"
208 #include "third_party/blink/public/common/input/web_input_event.h"
209 #include "third_party/blink/public/common/renderer_preferences/renderer_preferences.h"
210--- a/chrome/browser/download/chrome_download_manager_delegate.cc
211+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
212@@ -130,7 +130,6 @@ using content::DownloadManager;
204 using download::DownloadItem; 213 using download::DownloadItem;
205 using download::DownloadPathReservationTracker; 214 using download::DownloadPathReservationTracker;
206 using download::PathValidationResult; 215 using download::PathValidationResult;
@@ -208,7 +217,7 @@
208 using safe_browsing::DownloadProtectionService; 217 using safe_browsing::DownloadProtectionService;
209 using ConnectionType = net::NetworkChangeNotifier::ConnectionType; 218 using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
210 219
211@@ -1517,8 +1516,6 @@ void ChromeDownloadManagerDelegate::OnDo 220@@ -1519,8 +1518,6 @@ void ChromeDownloadManagerDelegate::OnDo
212 if (item->GetOriginalMimeType() == "application/x-x509-user-cert") 221 if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
213 DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); 222 DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
214 #endif 223 #endif
@@ -217,7 +226,7 @@
217 } 226 }
218 if (ShouldBlockFile(target_info->danger_type, item)) { 227 if (ShouldBlockFile(target_info->danger_type, item)) {
219 MaybeReportDangerousDownloadBlocked( 228 MaybeReportDangerousDownloadBlocked(
220@@ -1670,7 +1667,6 @@ void ChromeDownloadManagerDelegate::Mayb 229@@ -1655,7 +1652,6 @@ void ChromeDownloadManagerDelegate::Mayb
221 service->MaybeSendDangerousDownloadOpenedReport(download, 230 service->MaybeSendDangerousDownloadOpenedReport(download,
222 show_download_in_folder); 231 show_download_in_folder);
223 } 232 }
@@ -225,7 +234,7 @@
225 if (!download->GetAutoOpened()) { 234 if (!download->GetAutoOpened()) {
226 download::DownloadContent download_content = 235 download::DownloadContent download_content =
227 download::DownloadContentFromMimeType(download->GetMimeType(), false); 236 download::DownloadContentFromMimeType(download->GetMimeType(), false);
228@@ -1678,6 +1674,7 @@ void ChromeDownloadManagerDelegate::Mayb 237@@ -1663,6 +1659,7 @@ void ChromeDownloadManagerDelegate::Mayb
229 download->GetDangerType(), download_content, base::Time::Now(), 238 download->GetDangerType(), download_content, base::Time::Now(),
230 download->GetEndTime(), show_download_in_folder); 239 download->GetEndTime(), show_download_in_folder);
231 } 240 }
@@ -233,48 +242,27 @@
233 } 242 }
234 243
235 void ChromeDownloadManagerDelegate::CheckDownloadAllowed( 244 void ChromeDownloadManagerDelegate::CheckDownloadAllowed(
236@@ -1754,30 +1751,6 @@ void ChromeDownloadManagerDelegate::Chec 245@@ -1732,8 +1729,7 @@ void ChromeDownloadManagerDelegate::Chec
237 std::move(callback).Run(true); 246 DCHECK(download_item);
238 return; 247 DCHECK(download_item->IsSavePackageDownload());
239 } 248
240- 249-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
241- absl::optional<enterprise_connectors::AnalysisSettings> settings = 250- BUILDFLAG(IS_MAC)
242- safe_browsing::DeepScanningRequest::ShouldUploadBinary(download_item); 251+#if 0
243- 252 absl::optional<enterprise_connectors::AnalysisSettings> settings =
244- if (settings.has_value()) { 253 safe_browsing::DeepScanningRequest::ShouldUploadBinary(download_item);
245- DownloadProtectionService* service = GetDownloadProtectionService(); 254
246- // Save package never need malware scans, so exempt them from scanning if 255--- a/chrome/browser/download/download_stats.cc
247- // there are no other tags. 256+++ b/chrome/browser/download/download_stats.cc
248- settings->tags.erase("malware"); 257@@ -9,6 +9,7 @@
249- if (!settings->tags.empty() && service) {
250- download_item->SetUserData(
251- enterprise_connectors::SavePackageScanningData::kKey,
252- std::make_unique<enterprise_connectors::SavePackageScanningData>(
253- std::move(callback)));
254-
255- service->UploadSavePackageForDeepScanning(
256- download_item, std::move(save_package_files),
257- base::BindRepeating(
258- &ChromeDownloadManagerDelegate::CheckSavePackageScanningDone,
259- weak_ptr_factory_.GetWeakPtr(), download_item->GetId()),
260- std::move(settings.value()));
261- return;
262- }
263- }
264 #endif
265 std::move(callback).Run(true);
266 }
267--- chrome/browser/download/download_stats.cc.orig
268+++ chrome/browser/download/download_stats.cc
269@@ -8,6 +8,7 @@
270 #include "base/metrics/user_metrics.h"
271 #include "base/notreached.h" 258 #include "base/notreached.h"
259 #include "build/build_config.h"
272 #include "components/profile_metrics/browser_profile_type.h" 260 #include "components/profile_metrics/browser_profile_type.h"
273+#include "components/safe_browsing/buildflags.h" 261+#include "components/safe_browsing/buildflags.h"
274 #include "components/safe_browsing/content/browser/download/download_stats.h" 262 #include "components/safe_browsing/content/browser/download/download_stats.h"
275 263
276 void RecordDownloadCount(ChromeDownloadCountTypes type) { 264 void RecordDownloadCount(ChromeDownloadCountTypes type) {
277@@ -27,8 +28,10 @@ void RecordDangerousDownloadWarningShown 265@@ -28,8 +29,10 @@ void RecordDangerousDownloadWarningShown
278 bool has_user_gesture) { 266 bool has_user_gesture) {
279 base::UmaHistogramEnumeration("Download.ShowedDownloadWarning", danger_type, 267 base::UmaHistogramEnumeration("Download.ShowedDownloadWarning", danger_type,
280 download::DOWNLOAD_DANGER_TYPE_MAX); 268 download::DOWNLOAD_DANGER_TYPE_MAX);
@@ -285,23 +273,24 @@
285 } 273 }
286 274
287 void RecordOpenedDangerousConfirmDialog( 275 void RecordOpenedDangerousConfirmDialog(
288--- chrome/browser/download/download_target_determiner.cc.orig 276--- a/chrome/browser/download/download_target_determiner.cc
289+++ chrome/browser/download/download_target_determiner.cc 277+++ b/chrome/browser/download/download_target_determiner.cc
290@@ -872,11 +872,13 @@ void DownloadTargetDeterminer::CheckVisi 278@@ -877,12 +877,14 @@ void DownloadTargetDeterminer::CheckVisi
291 bool visited_referrer_before) { 279 bool visited_referrer_before) {
292 DCHECK_CURRENTLY_ON(BrowserThread::UI); 280 DCHECK_CURRENTLY_ON(BrowserThread::UI);
293 DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_); 281 DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_);
294+#if BUILDFLAG(FULL_SAFE_BROWSING) 282+#if BUILDFLAG(FULL_SAFE_BROWSING)
295 safe_browsing::RecordDownloadFileTypeAttributes( 283 safe_browsing::RecordDownloadFileTypeAttributes(
296 safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel( 284 safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel(
297 virtual_path_.BaseName()), 285 virtual_path_.BaseName(), download_->GetURL(),
286 GetProfile()->GetPrefs()),
298 download_->HasUserGesture(), visited_referrer_before, 287 download_->HasUserGesture(), visited_referrer_before,
299 GetLastDownloadBypassTimestamp()); 288 GetLastDownloadBypassTimestamp());
300+#endif // BUILDFLAG(FULL_SAFE_BROWSING) 289+#endif // BUILDFLAG(FULL_SAFE_BROWSING)
301 danger_level_ = GetDangerLevel( 290 danger_level_ = GetDangerLevel(
302 visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER); 291 visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER);
303 if (danger_level_ != DownloadFileType::NOT_DANGEROUS && 292 if (danger_level_ != DownloadFileType::NOT_DANGEROUS &&
304@@ -1111,6 +1113,7 @@ DownloadFileType::DangerLevel DownloadTa 293@@ -1122,6 +1124,7 @@ DownloadFileType::DangerLevel DownloadTa
305 294
306 absl::optional<base::Time> 295 absl::optional<base::Time>
307 DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const { 296 DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const {
@@ -309,7 +298,7 @@
309 safe_browsing::SafeBrowsingMetricsCollector* metrics_collector = 298 safe_browsing::SafeBrowsingMetricsCollector* metrics_collector =
310 safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile( 299 safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
311 GetProfile()); 300 GetProfile());
312@@ -1119,6 +1122,9 @@ DownloadTargetDeterminer::GetLastDownloa 301@@ -1130,6 +1133,9 @@ DownloadTargetDeterminer::GetLastDownloa
313 safe_browsing::SafeBrowsingMetricsCollector:: 302 safe_browsing::SafeBrowsingMetricsCollector::
314 EventType::DANGEROUS_DOWNLOAD_BYPASS) 303 EventType::DANGEROUS_DOWNLOAD_BYPASS)
315 : absl::nullopt; 304 : absl::nullopt;
@@ -319,19 +308,19 @@
319 } 308 }
320 309
321 void DownloadTargetDeterminer::OnDownloadDestroyed( 310 void DownloadTargetDeterminer::OnDownloadDestroyed(
322--- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc.orig 311--- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
323+++ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc 312+++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
324@@ -32,7 +32,6 @@ 313@@ -33,7 +33,6 @@
325 #include "chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service_factory.h" 314 #include "chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service_factory.h"
326 #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h" 315 #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h"
327 #include "chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request.h" 316 #include "chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request.h"
328-#include "chrome/browser/safe_browsing/download_protection/check_client_download_request.h" 317-#include "chrome/browser/safe_browsing/download_protection/check_client_download_request.h"
329 #include "chrome/grit/generated_resources.h" 318 #include "chrome/grit/generated_resources.h"
330 #include "components/enterprise/common/proto/connectors.pb.h" 319 #include "components/enterprise/common/proto/connectors.pb.h"
331 #include "components/policy/core/browser/url_util.h" 320 #include "components/policy/core/common/chrome_schema.h"
332--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 321--- a/chrome/browser/enterprise/connectors/connectors_service.cc
333+++ chrome/browser/enterprise/connectors/connectors_service.cc 322+++ b/chrome/browser/enterprise/connectors/connectors_service.cc
334@@ -475,19 +475,6 @@ absl::optional<std::string> ConnectorsSe 323@@ -461,19 +461,6 @@ absl::optional<std::string> ConnectorsSe
335 return absl::nullopt; 324 return absl::nullopt;
336 } 325 }
337 326
@@ -351,9 +340,9 @@
351 ConnectorsManager* ConnectorsService::ConnectorsManagerForTesting() { 340 ConnectorsManager* ConnectorsService::ConnectorsManagerForTesting() {
352 return connectors_manager_.get(); 341 return connectors_manager_.get();
353 } 342 }
354--- chrome/browser/enterprise/connectors/connectors_service.h.orig 343--- a/chrome/browser/enterprise/connectors/connectors_service.h
355+++ chrome/browser/enterprise/connectors/connectors_service.h 344+++ b/chrome/browser/enterprise/connectors/connectors_service.h
356@@ -78,12 +78,6 @@ class ConnectorsService : public KeyedSe 345@@ -80,12 +80,6 @@ class ConnectorsService : public KeyedSe
357 // is no token to use. 346 // is no token to use.
358 absl::optional<std::string> GetDMTokenForRealTimeUrlCheck() const; 347 absl::optional<std::string> GetDMTokenForRealTimeUrlCheck() const;
359 348
@@ -366,18 +355,18 @@
366 // Returns the CBCM domain or profile domain that enables connector policies. 355 // Returns the CBCM domain or profile domain that enables connector policies.
367 // If both set Connector policies, the CBCM domain is returned as it has 356 // If both set Connector policies, the CBCM domain is returned as it has
368 // precedence. 357 // precedence.
369--- chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.cc.orig 358--- a/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.cc
370+++ chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.cc 359+++ b/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.cc
371@@ -38,9 +38,6 @@ void CommonSignalsDecorator::Decorate(Si 360@@ -41,9 +41,6 @@ void CommonSignalsDecorator::Decorate(Si
372 // Get signals from policy values. 361 // Get signals from policy values.
373 signals.set_built_in_dns_client_enabled( 362 signals.set_built_in_dns_client_enabled(
374 enterprise_signals::utils::GetBuiltInDnsClientEnabled(local_state_)); 363 enterprise_signals::utils::GetBuiltInDnsClientEnabled(local_state_));
375- signals.set_safe_browsing_protection_level(static_cast<int32_t>( 364- signals.set_safe_browsing_protection_level(static_cast<int32_t>(
376- enterprise_signals::utils::GetSafeBrowsingProtectionLevel( 365- enterprise_signals::utils::GetSafeBrowsingProtectionLevel(
377- profile_prefs_))); 366- profile_prefs_)));
378 signals.set_remote_desktop_available( 367
379 enterprise_signals::utils::GetChromeRemoteDesktopAppBlocked( 368 absl::optional<bool> third_party_blocking_enabled =
380 policy_blocklist_service_)); 369 enterprise_signals::utils::GetThirdPartyBlockingEnabled(local_state_);
381@@ -58,15 +55,6 @@ void CommonSignalsDecorator::Decorate(Si 370@@ -58,15 +55,6 @@ void CommonSignalsDecorator::Decorate(Si
382 signals.set_chrome_cleanup_enabled(chrome_cleanup_enabled.value()); 371 signals.set_chrome_cleanup_enabled(chrome_cleanup_enabled.value());
383 } 372 }
@@ -391,12 +380,32 @@
391- static_cast<int32_t>(password_protection_warning_trigger.value())); 380- static_cast<int32_t>(password_protection_warning_trigger.value()));
392- } 381- }
393- 382-
394 std::move(done_closure).Run(); 383 if (cached_device_model_ && cached_device_manufacturer_) {
395 } 384 UpdateFromCache(signals);
385 LogSignalsCollectionLatency(kLatencyHistogramWithCacheVariant, start_time);
386--- a/chrome/browser/enterprise/connectors/reporting/reporting_service_settings.cc
387+++ b/chrome/browser/enterprise/connectors/reporting/reporting_service_settings.cc
388@@ -63,17 +63,6 @@ ReportingServiceSettings::ReportingServi
389 else
390 DVLOG(1) << "Enabled event name list contains a non string value!";
391 }
392- } else {
393- // When the list of enabled event names is not set, we assume all events are
394- // enabled. This is to support the feature of selecting the "All always on"
395- // option in the policy UI, which means to always enable all events, even
396- // when new events may be added in the future. And this is also to support
397- // existing customer policies that were created before we introduced the
398- // concept of enabling/disabling events.
399- for (auto* event_name :
400- extensions::SafeBrowsingPrivateEventRouter::kAllEvents) {
401- enabled_event_names_.insert(event_name);
402- }
403 }
396 404
397--- chrome/browser/enterprise/signals/context_info_fetcher.cc.orig 405 const base::Value* enabled_opt_in_events_value =
398+++ chrome/browser/enterprise/signals/context_info_fetcher.cc 406--- a/chrome/browser/enterprise/signals/context_info_fetcher.cc
399@@ -169,7 +169,6 @@ void ContextInfoFetcher::Fetch(ContextIn 407+++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc
408@@ -204,7 +204,6 @@ void ContextInfoFetcher::Fetch(ContextIn
400 GetAnalysisConnectorProviders(enterprise_connectors::FILE_DOWNLOADED); 409 GetAnalysisConnectorProviders(enterprise_connectors::FILE_DOWNLOADED);
401 info.on_bulk_data_entry_providers = 410 info.on_bulk_data_entry_providers =
402 GetAnalysisConnectorProviders(enterprise_connectors::BULK_DATA_ENTRY); 411 GetAnalysisConnectorProviders(enterprise_connectors::BULK_DATA_ENTRY);
@@ -404,7 +413,7 @@
404 info.on_security_event_providers = GetOnSecurityEventProviders(); 413 info.on_security_event_providers = GetOnSecurityEventProviders();
405 info.browser_version = version_info::GetVersionNumber(); 414 info.browser_version = version_info::GetVersionNumber();
406 info.site_isolation_enabled = 415 info.site_isolation_enabled =
407@@ -227,11 +226,6 @@ std::vector<std::string> ContextInfoFetc 416@@ -262,11 +261,6 @@ std::vector<std::string> ContextInfoFetc
408 return connectors_service_->GetAnalysisServiceProviderNames(connector); 417 return connectors_service_->GetAnalysisServiceProviderNames(connector);
409 } 418 }
410 419
@@ -416,8 +425,8 @@
416 std::vector<std::string> ContextInfoFetcher::GetOnSecurityEventProviders() { 425 std::vector<std::string> ContextInfoFetcher::GetOnSecurityEventProviders() {
417 return connectors_service_->GetReportingServiceProviderNames( 426 return connectors_service_->GetReportingServiceProviderNames(
418 enterprise_connectors::ReportingConnector::SECURITY_EVENT); 427 enterprise_connectors::ReportingConnector::SECURITY_EVENT);
419--- chrome/browser/enterprise/signals/context_info_fetcher.h.orig 428--- a/chrome/browser/enterprise/signals/context_info_fetcher.h
420+++ chrome/browser/enterprise/signals/context_info_fetcher.h 429+++ b/chrome/browser/enterprise/signals/context_info_fetcher.h
421@@ -6,6 +6,7 @@ 430@@ -6,6 +6,7 @@
422 #define CHROME_BROWSER_ENTERPRISE_SIGNALS_CONTEXT_INFO_FETCHER_H_ 431 #define CHROME_BROWSER_ENTERPRISE_SIGNALS_CONTEXT_INFO_FETCHER_H_
423 432
@@ -426,7 +435,7 @@
426 #include <vector> 435 #include <vector>
427 436
428 #include "base/callback_forward.h" 437 #include "base/callback_forward.h"
429@@ -37,7 +38,6 @@ struct ContextInfo { 438@@ -38,7 +39,6 @@ struct ContextInfo {
430 std::vector<std::string> on_file_downloaded_providers; 439 std::vector<std::string> on_file_downloaded_providers;
431 std::vector<std::string> on_bulk_data_entry_providers; 440 std::vector<std::string> on_bulk_data_entry_providers;
432 std::vector<std::string> on_security_event_providers; 441 std::vector<std::string> on_security_event_providers;
@@ -434,7 +443,7 @@
434 std::string browser_version; 443 std::string browser_version;
435 safe_browsing::SafeBrowsingState safe_browsing_protection_level; 444 safe_browsing::SafeBrowsingState safe_browsing_protection_level;
436 bool site_isolation_enabled; 445 bool site_isolation_enabled;
437@@ -88,7 +88,6 @@ class ContextInfoFetcher { 446@@ -89,7 +89,6 @@ class ContextInfoFetcher {
438 std::vector<std::string> GetAnalysisConnectorProviders( 447 std::vector<std::string> GetAnalysisConnectorProviders(
439 enterprise_connectors::AnalysisConnector connector); 448 enterprise_connectors::AnalysisConnector connector);
440 449
@@ -442,8 +451,8 @@
442 451
443 std::vector<std::string> GetOnSecurityEventProviders(); 452 std::vector<std::string> GetOnSecurityEventProviders();
444 453
445--- chrome/browser/enterprise/signals/signals_utils.cc.orig 454--- a/chrome/browser/enterprise/signals/signals_utils.cc
446+++ chrome/browser/enterprise/signals/signals_utils.cc 455+++ b/chrome/browser/enterprise/signals/signals_utils.cc
447@@ -33,24 +33,6 @@ bool IsURLBlocked(const GURL& url, Polic 456@@ -33,24 +33,6 @@ bool IsURLBlocked(const GURL& url, Polic
448 457
449 } // namespace 458 } // namespace
@@ -468,7 +477,7 @@
468- 477-
469 absl::optional<bool> GetThirdPartyBlockingEnabled(PrefService* local_state) { 478 absl::optional<bool> GetThirdPartyBlockingEnabled(PrefService* local_state) {
470 DCHECK(local_state); 479 DCHECK(local_state);
471 #if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) 480 #if BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
472@@ -65,15 +47,6 @@ bool GetBuiltInDnsClientEnabled(PrefServ 481@@ -65,15 +47,6 @@ bool GetBuiltInDnsClientEnabled(PrefServ
473 return local_state->GetBoolean(prefs::kBuiltInDnsClientEnabled); 482 return local_state->GetBoolean(prefs::kBuiltInDnsClientEnabled);
474 } 483 }
@@ -484,9 +493,9 @@
484- 493-
485 absl::optional<bool> GetChromeCleanupEnabled(PrefService* local_state) { 494 absl::optional<bool> GetChromeCleanupEnabled(PrefService* local_state) {
486 DCHECK(local_state); 495 DCHECK(local_state);
487 #if defined(OS_WIN) 496 #if BUILDFLAG(IS_WIN)
488--- chrome/browser/enterprise/signals/signals_utils.h.orig 497--- a/chrome/browser/enterprise/signals/signals_utils.h
489+++ chrome/browser/enterprise/signals/signals_utils.h 498+++ b/chrome/browser/enterprise/signals/signals_utils.h
490@@ -21,12 +21,6 @@ bool GetBuiltInDnsClientEnabled(PrefServ 499@@ -21,12 +21,6 @@ bool GetBuiltInDnsClientEnabled(PrefServ
491 500
492 absl::optional<bool> GetChromeCleanupEnabled(PrefService* local_state); 501 absl::optional<bool> GetChromeCleanupEnabled(PrefService* local_state);
@@ -500,9 +509,20 @@
500 bool GetChromeRemoteDesktopAppBlocked(PolicyBlocklistService* service); 509 bool GetChromeRemoteDesktopAppBlocked(PolicyBlocklistService* service);
501 510
502 } // namespace utils 511 } // namespace utils
503--- chrome/browser/extensions/BUILD.gn.orig 512--- a/chrome/browser/extensions/BUILD.gn
504+++ chrome/browser/extensions/BUILD.gn 513+++ b/chrome/browser/extensions/BUILD.gn
505@@ -650,8 +650,6 @@ static_library("extensions") { 514@@ -300,10 +300,6 @@ static_library("extensions") {
515 "api/runtime/chrome_runtime_api_delegate.h",
516 "api/safe_browsing_private/safe_browsing_private_api.cc",
517 "api/safe_browsing_private/safe_browsing_private_api.h",
518- "api/safe_browsing_private/safe_browsing_private_event_router.cc",
519- "api/safe_browsing_private/safe_browsing_private_event_router.h",
520- "api/safe_browsing_private/safe_browsing_private_event_router_factory.cc",
521- "api/safe_browsing_private/safe_browsing_private_event_router_factory.h",
522 "api/safe_browsing_private/safe_browsing_util.cc",
523 "api/safe_browsing_private/safe_browsing_util.h",
524 "api/scripting/scripting_api.cc",
525@@ -638,8 +634,6 @@ static_library("extensions") {
506 "menu_manager_factory.h", 526 "menu_manager_factory.h",
507 "navigation_observer.cc", 527 "navigation_observer.cc",
508 "navigation_observer.h", 528 "navigation_observer.h",
@@ -511,8 +531,8 @@
511 "pack_extension_job.cc", 531 "pack_extension_job.cc",
512 "pack_extension_job.h", 532 "pack_extension_job.h",
513 "pending_extension_info.cc", 533 "pending_extension_info.cc",
514--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 534--- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
515+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc 535+++ b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
516@@ -72,17 +72,8 @@ api::enterprise_reporting_private::Conte 536@@ -72,17 +72,8 @@ api::enterprise_reporting_private::Conte
517 : nullptr; 537 : nullptr;
518 info.os_firewall = ToInfoSettingValue(signals.os_firewall); 538 info.os_firewall = ToInfoSettingValue(signals.os_firewall);
@@ -531,183 +551,75 @@
531 info.browser_version = std::move(signals.browser_version); 551 info.browser_version = std::move(signals.browser_version);
532 info.built_in_dns_client_enabled = signals.built_in_dns_client_enabled; 552 info.built_in_dns_client_enabled = signals.built_in_dns_client_enabled;
533 553
534--- chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc.orig 554--- a/chrome/browser/extensions/browser_context_keyed_service_factories.cc
535+++ chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc 555+++ b/chrome/browser/extensions/browser_context_keyed_service_factories.cc
536@@ -326,6 +326,7 @@ void SafeBrowsingPrivateEventRouter::OnD 556@@ -125,7 +125,6 @@ void EnsureBrowserContextKeyedServiceFac
537 event_router_->BroadcastEvent(std::move(extension_event)); 557 #endif
538 } 558 extensions::PreferenceAPI::GetFactoryInstance();
539 559 extensions::ProcessesAPI::GetFactoryInstance();
540+#if defined(FULL_SAFE_BROWSING) 560- extensions::SafeBrowsingPrivateEventRouterFactory::GetInstance();
541 absl::optional<enterprise_connectors::ReportingSettings> settings = 561 extensions::SessionsAPI::GetFactoryInstance();
542 GetReportingSettings(); 562 #if BUILDFLAG(IS_CHROMEOS)
543 if (!settings.has_value() || 563 extensions::SessionStateChangedEventDispatcher::GetFactoryInstance();
544@@ -356,6 +357,7 @@ void SafeBrowsingPrivateEventRouter::OnD 564--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
545 565+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
546 ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()), 566@@ -612,51 +612,22 @@ void ChromeExtensionsBrowserClient::Noti
547 std::move(event)); 567 content::BrowserContext* context,
548+#endif // FULL_SAFE_BROWSING 568 const ExtensionId& extension_id,
549 } 569 const std::string& code) const {
550 570- auto* telemetry_service =
551 void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialShown( 571- safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile(
552@@ -383,6 +385,7 @@ void SafeBrowsingPrivateEventRouter::OnS 572- Profile::FromBrowserContext(context));
553 event_router_->BroadcastEvent(std::move(extension_event)); 573- if (!telemetry_service || !telemetry_service->enabled() ||
554 } 574- !base::FeatureList::IsEnabled(
555 575- safe_browsing::kExtensionTelemetryTabsExecuteScriptSignal)) {
556+#if defined(FULL_SAFE_BROWSING) 576- return;
557 absl::optional<enterprise_connectors::ReportingSettings> settings = 577- }
558 GetReportingSettings(); 578-
559 if (!settings.has_value() || 579- auto signal = std::make_unique<safe_browsing::TabsExecuteScriptSignal>(
560@@ -406,6 +409,7 @@ void SafeBrowsingPrivateEventRouter::OnS 580- extension_id, code);
561 581- telemetry_service->AddSignal(std::move(signal));
562 ReportRealtimeEvent(kKeyInterstitialEvent, std::move(settings.value()),
563 std::move(event));
564+#endif // FULL_SAFE_BROWSING
565 }
566
567 void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialProceeded(
568@@ -433,6 +437,7 @@ void SafeBrowsingPrivateEventRouter::OnS
569 event_router_->BroadcastEvent(std::move(extension_event));
570 }
571
572+#if defined(FULL_SAFE_BROWSING)
573 absl::optional<enterprise_connectors::ReportingSettings> settings =
574 GetReportingSettings();
575 if (!settings.has_value() ||
576@@ -452,6 +457,7 @@ void SafeBrowsingPrivateEventRouter::OnS
577
578 ReportRealtimeEvent(kKeyInterstitialEvent, std::move(settings.value()),
579 std::move(event));
580+#endif // FULL_SAFE_BROWSING
581 }
582
583 void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorResult(
584@@ -465,6 +471,7 @@ void SafeBrowsingPrivateEventRouter::OnA
585 const enterprise_connectors::ContentAnalysisResponse::Result& result,
586 const int64_t content_size,
587 safe_browsing::EventResult event_result) {
588+#if defined(FULL_SAFE_BROWSING)
589 if (result.tag() == "malware") {
590 DCHECK_EQ(1, result.triggered_rules().size());
591 OnDangerousDeepScanningResult(
592@@ -476,6 +483,7 @@ void SafeBrowsingPrivateEventRouter::OnA
593 OnSensitiveDataEvent(url, file_name, download_digest_sha256, mime_type,
594 trigger, scan_id, result, content_size, event_result);
595 }
596+#endif // FULL_SAFE_BROWSING
597 }
598
599 void SafeBrowsingPrivateEventRouter::OnDangerousDeepScanningResult(
600@@ -491,6 +499,7 @@ void SafeBrowsingPrivateEventRouter::OnD
601 const std::string& malware_category,
602 const std::string& evidence_locker_filepath,
603 const std::string& scan_id) {
604+#if defined(FULL_SAFE_BROWSING)
605 absl::optional<enterprise_connectors::ReportingSettings> settings =
606 GetReportingSettings();
607 if (!settings.has_value() ||
608@@ -528,6 +537,7 @@ void SafeBrowsingPrivateEventRouter::OnD
609
610 ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()),
611 std::move(event));
612+#endif // FULL_SAFE_BROWSING
613 }
614
615 void SafeBrowsingPrivateEventRouter::OnSensitiveDataEvent(
616@@ -540,6 +550,7 @@ void SafeBrowsingPrivateEventRouter::OnS
617 const enterprise_connectors::ContentAnalysisResponse::Result& result,
618 const int64_t content_size,
619 safe_browsing::EventResult event_result) {
620+#if defined(FULL_SAFE_BROWSING)
621 absl::optional<enterprise_connectors::ReportingSettings> settings =
622 GetReportingSettings();
623 if (!settings.has_value() ||
624@@ -572,6 +583,7 @@ void SafeBrowsingPrivateEventRouter::OnS
625
626 ReportRealtimeEvent(kKeySensitiveDataEvent, std::move(settings.value()),
627 std::move(event));
628+#endif // FULL_SAFE_BROWSING
629 }
630
631 void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorWarningBypassed(
632@@ -584,6 +596,7 @@ void SafeBrowsingPrivateEventRouter::OnA
633 safe_browsing::DeepScanAccessPoint access_point,
634 const enterprise_connectors::ContentAnalysisResponse::Result& result,
635 const int64_t content_size) {
636+#if defined(FULL_SAFE_BROWSING)
637 absl::optional<enterprise_connectors::ReportingSettings> settings =
638 GetReportingSettings();
639 if (!settings.has_value() ||
640@@ -616,6 +629,7 @@ void SafeBrowsingPrivateEventRouter::OnA
641
642 ReportRealtimeEvent(kKeySensitiveDataEvent, std::move(settings.value()),
643 std::move(event));
644+#endif // FULL_SAFE_BROWSING
645 }
646
647 void SafeBrowsingPrivateEventRouter::OnUnscannedFileEvent(
648@@ -628,6 +642,7 @@ void SafeBrowsingPrivateEventRouter::OnU
649 const std::string& reason,
650 const int64_t content_size,
651 safe_browsing::EventResult event_result) {
652+#if defined(FULL_SAFE_BROWSING)
653 absl::optional<enterprise_connectors::ReportingSettings> settings =
654 GetReportingSettings();
655 if (!settings.has_value() ||
656@@ -654,6 +669,7 @@ void SafeBrowsingPrivateEventRouter::OnU
657
658 ReportRealtimeEvent(kKeyUnscannedFileEvent, std::move(settings.value()),
659 std::move(event));
660+#endif // FULL_SAFE_BROWSING
661 }
662
663 void SafeBrowsingPrivateEventRouter::OnDangerousDownloadEvent(
664@@ -679,6 +695,7 @@ void SafeBrowsingPrivateEventRouter::OnD
665 const std::string& scan_id,
666 const int64_t content_size,
667 safe_browsing::EventResult event_result) {
668+#if defined(FULL_SAFE_BROWSING)
669 absl::optional<enterprise_connectors::ReportingSettings> settings =
670 GetReportingSettings();
671 if (!settings.has_value() ||
672@@ -709,6 +726,7 @@ void SafeBrowsingPrivateEventRouter::OnD
673
674 ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()),
675 std::move(event));
676+#endif
677 } 582 }
678 583
679 void SafeBrowsingPrivateEventRouter::OnDangerousDownloadWarningBypassed( 584 bool ChromeExtensionsBrowserClient::IsExtensionTelemetryServiceEnabled(
680@@ -732,6 +750,7 @@ void SafeBrowsingPrivateEventRouter::OnD 585 content::BrowserContext* context) const {
681 const std::string& mime_type, 586- auto* telemetry_service =
682 const std::string& scan_id, 587- safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile(
683 const int64_t content_size) { 588- Profile::FromBrowserContext(context));
684+#if defined(FULL_SAFE_BROWSING) 589- return telemetry_service && telemetry_service->enabled();
685 absl::optional<enterprise_connectors::ReportingSettings> settings = 590+ return false;
686 GetReportingSettings();
687 if (!settings.has_value() ||
688@@ -762,6 +781,7 @@ void SafeBrowsingPrivateEventRouter::OnD
689
690 ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()),
691 std::move(event));
692+#endif // FULL_SAFE_BROWSING
693 } 591 }
694 592
695 void SafeBrowsingPrivateEventRouter::OnLoginEvent( 593 bool ChromeExtensionsBrowserClient::
696@@ -1087,7 +1107,11 @@ void SafeBrowsingPrivateEventRouter::Rep 594 IsExtensionTelemetryRemoteHostContactedSignalEnabled() const {
595- return base::FeatureList::IsEnabled(
596- safe_browsing::kExtensionTelemetryReportContactedHosts);
597+ return false;
697 } 598 }
698 599
699 std::string SafeBrowsingPrivateEventRouter::GetProfileUserName() const { 600 void ChromeExtensionsBrowserClient::NotifyExtensionRemoteHostContacted(
700+#if defined(FULL_SAFE_BROWSING) 601 content::BrowserContext* context,
701 return safe_browsing::GetProfileEmail(identity_manager_); 602 const ExtensionId& extension_id,
702+#else 603 const GURL& url) const {
703+ return ""; 604- if (!url.SchemeIsHTTPOrHTTPS()) {
704+#endif 605- return;
606- }
607- auto* telemetry_service =
608- safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile(
609- Profile::FromBrowserContext(context));
610- if (!telemetry_service || !telemetry_service->enabled()) {
611- return;
612- }
613- auto remote_host_signal =
614- std::make_unique<safe_browsing::RemoteHostContactedSignal>(extension_id,
615- url);
616- telemetry_service->AddSignal(std::move(remote_host_signal));
705 } 617 }
706 618
707 #if BUILDFLAG(IS_CHROMEOS_ASH) 619 // static
708--- chrome/browser/extensions/extension_service.cc.orig 620--- a/chrome/browser/extensions/extension_service.cc
709+++ chrome/browser/extensions/extension_service.cc 621+++ b/chrome/browser/extensions/extension_service.cc
710@@ -52,7 +52,6 @@ 622@@ -53,7 +53,6 @@
711 #include "chrome/browser/extensions/forced_extensions/install_stage_tracker.h" 623 #include "chrome/browser/extensions/forced_extensions/install_stage_tracker.h"
712 #include "chrome/browser/extensions/install_verifier.h" 624 #include "chrome/browser/extensions/install_verifier.h"
713 #include "chrome/browser/extensions/installed_loader.h" 625 #include "chrome/browser/extensions/installed_loader.h"
@@ -715,7 +627,15 @@
715 #include "chrome/browser/extensions/pending_extension_manager.h" 627 #include "chrome/browser/extensions/pending_extension_manager.h"
716 #include "chrome/browser/extensions/permissions_updater.h" 628 #include "chrome/browser/extensions/permissions_updater.h"
717 #include "chrome/browser/extensions/shared_module_service.h" 629 #include "chrome/browser/extensions/shared_module_service.h"
718@@ -370,7 +369,6 @@ ExtensionService::ExtensionService(Profi 630@@ -207,7 +206,6 @@ void ExtensionService::BlocklistExtensio
631 blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
632 extension_id, BitMapBlocklistState::BLOCKLISTED_MALWARE,
633 extension_prefs_);
634- OnBlocklistStateAdded(extension_id);
635 }
636
637 bool ExtensionService::OnExternalExtensionUpdateUrlFound(
638@@ -370,7 +368,6 @@ ExtensionService::ExtensionService(Profi
719 safe_browsing_verdict_handler_(extension_prefs, 639 safe_browsing_verdict_handler_(extension_prefs,
720 ExtensionRegistry::Get(profile), 640 ExtensionRegistry::Get(profile),
721 this), 641 this),
@@ -723,7 +643,7 @@
723 registry_(ExtensionRegistry::Get(profile)), 643 registry_(ExtensionRegistry::Get(profile)),
724 pending_extension_manager_(profile), 644 pending_extension_manager_(profile),
725 install_directory_(install_directory), 645 install_directory_(install_directory),
726@@ -852,47 +850,6 @@ bool ExtensionService::IsExtensionEnable 646@@ -870,100 +867,6 @@ bool ExtensionService::IsExtensionEnable
727 return extension_registrar_.IsExtensionEnabled(extension_id); 647 return extension_registrar_.IsExtensionEnabled(extension_id);
728 } 648 }
729 649
@@ -731,56 +651,14 @@
731- const std::string& extension_id, 651- const std::string& extension_id,
732- const base::Value& attributes) { 652- const base::Value& attributes) {
733- DCHECK_CURRENTLY_ON(BrowserThread::UI); 653- DCHECK_CURRENTLY_ON(BrowserThread::UI);
734- HandleMalwareOmahaAttribute(extension_id, attributes);
735- omaha_attributes_handler_.PerformActionBasedOnOmahaAttributes(extension_id, 654- omaha_attributes_handler_.PerformActionBasedOnOmahaAttributes(extension_id,
736- attributes); 655- attributes);
737- allowlist_.PerformActionBasedOnOmahaAttributes(extension_id, attributes); 656- allowlist_.PerformActionBasedOnOmahaAttributes(extension_id, attributes);
738-}
739-
740-void ExtensionService::HandleMalwareOmahaAttribute(
741- const std::string& extension_id,
742- const base::Value& attributes) {
743- bool has_malware_value =
744- OmahaAttributesHandler::HasOmahaBlocklistStateInAttributes(
745- attributes, BitMapBlocklistState::BLOCKLISTED_MALWARE);
746- if (!has_malware_value) {
747- OmahaAttributesHandler::ReportNoUpdateCheckKeys();
748- // Omaha attributes may have previously have the "_malware" key.
749- MaybeEnableRemotelyDisabledExtension(extension_id);
750- return;
751- }
752-
753- if (extension_prefs_->HasDisableReason(
754- extension_id, disable_reason::DISABLE_REMOTELY_FOR_MALWARE)) {
755- // The extension is already disabled. No work needs to be done.
756- return;
757- }
758-
759- OmahaAttributesHandler::ReportExtensionDisabledRemotely(
760- extension_registrar_.IsExtensionEnabled(extension_id),
761- ExtensionUpdateCheckDataKey::kMalware);
762-
763- // Add the extension to the blocklisted extensions set.
764- UpdateBlocklistedExtensions({extension_id},
765- registry_->blocklisted_extensions().GetIDs());
766- extension_prefs_->AddDisableReason(
767- extension_id, disable_reason::DISABLE_REMOTELY_FOR_MALWARE);
768- // Show an error for the newly blocklisted extension. 657- // Show an error for the newly blocklisted extension.
769- error_controller_->ShowErrorIfNeeded(); 658- error_controller_->ShowErrorIfNeeded();
770-} 659-}
771
772 void ExtensionService::MaybeEnableRemotelyDisabledExtension(
773 const std::string& extension_id) {
774@@ -909,56 +866,6 @@ void ExtensionService::MaybeEnableRemote
775 unchanged.erase(extension_id);
776 // Remove the extension from the blocklist.
777 UpdateBlocklistedExtensions({}, unchanged);
778- OmahaAttributesHandler::ReportReenableExtension(
779- ExtensionUpdateCheckDataKey::kMalware);
780-}
781- 660-
782-void ExtensionService::ClearGreylistedAcknowledgedStateAndMaybeReenable( 661-void ExtensionService::OnGreylistStateRemoved(const std::string& extension_id) {
783- const std::string& extension_id) {
784- bool is_on_sb_list = (blocklist_prefs::GetSafeBrowsingExtensionBlocklistState( 662- bool is_on_sb_list = (blocklist_prefs::GetSafeBrowsingExtensionBlocklistState(
785- extension_id, extension_prefs_) != 663- extension_id, extension_prefs_) !=
786- BitMapBlocklistState::NOT_BLOCKLISTED); 664- BitMapBlocklistState::NOT_BLOCKLISTED);
@@ -797,9 +675,8 @@
797- disable_reason::DISABLE_GREYLIST); 675- disable_reason::DISABLE_GREYLIST);
798-} 676-}
799- 677-
800-void ExtensionService::MaybeDisableGreylistedExtension( 678-void ExtensionService::OnGreylistStateAdded(const std::string& extension_id,
801- const std::string& extension_id, 679- BitMapBlocklistState new_state) {
802- BitMapBlocklistState new_state) {
803-#if DCHECK_IS_ON() 680-#if DCHECK_IS_ON()
804- bool has_new_state_on_sb_list = 681- bool has_new_state_on_sb_list =
805- (blocklist_prefs::GetSafeBrowsingExtensionBlocklistState( 682- (blocklist_prefs::GetSafeBrowsingExtensionBlocklistState(
@@ -825,12 +702,51 @@
825- blocklist_prefs::UpdateCurrentGreylistStatesAsAcknowledged(extension_id, 702- blocklist_prefs::UpdateCurrentGreylistStatesAsAcknowledged(extension_id,
826- extension_prefs_); 703- extension_prefs_);
827- DisableExtension(extension_id, disable_reason::DISABLE_GREYLIST); 704- DisableExtension(extension_id, disable_reason::DISABLE_GREYLIST);
828 } 705-}
829 706-
707-void ExtensionService::OnBlocklistStateRemoved(
708- const std::string& extension_id) {
709- if (blocklist_prefs::IsExtensionBlocklisted(extension_id, extension_prefs_)) {
710- return;
711- }
712-
713- // Clear acknowledged state.
714- blocklist_prefs::RemoveAcknowledgedBlocklistState(
715- extension_id, BitMapBlocklistState::BLOCKLISTED_MALWARE,
716- extension_prefs_);
717-
718- scoped_refptr<const Extension> extension =
719- registry_->blocklisted_extensions().GetByID(extension_id);
720- DCHECK(extension);
721- registry_->RemoveBlocklisted(extension_id);
722- AddExtension(extension.get());
723-}
724-
725-void ExtensionService::OnBlocklistStateAdded(const std::string& extension_id) {
726- DCHECK(
727- blocklist_prefs::IsExtensionBlocklisted(extension_id, extension_prefs_));
728- // The extension was already acknowledged by the user, it should already be in
729- // the unloaded state.
730- if (blocklist_prefs::HasAcknowledgedBlocklistState(
731- extension_id, BitMapBlocklistState::BLOCKLISTED_MALWARE,
732- extension_prefs_)) {
733- DCHECK(base::Contains(registry_->blocklisted_extensions().GetIDs(),
734- extension_id));
735- return;
736- }
737-
738- scoped_refptr<const Extension> extension =
739- registry_->GetInstalledExtension(extension_id);
740- registry_->AddBlocklisted(extension);
741- UnloadExtension(extension_id, UnloadedExtensionReason::BLOCKLIST);
742-}
743-
830 void ExtensionService::RemoveDisableReasonAndMaybeEnable( 744 void ExtensionService::RemoveDisableReasonAndMaybeEnable(
831--- chrome/browser/extensions/extension_service.h.orig 745 const std::string& extension_id,
832+++ chrome/browser/extensions/extension_service.h 746 disable_reason::DisableReason reason_to_remove) {
833@@ -25,7 +25,6 @@ 747--- a/chrome/browser/extensions/extension_service.h
748+++ b/chrome/browser/extensions/extension_service.h
749@@ -26,7 +26,6 @@
834 #include "chrome/browser/extensions/forced_extensions/force_installed_metrics.h" 750 #include "chrome/browser/extensions/forced_extensions/force_installed_metrics.h"
835 #include "chrome/browser/extensions/forced_extensions/force_installed_tracker.h" 751 #include "chrome/browser/extensions/forced_extensions/force_installed_tracker.h"
836 #include "chrome/browser/extensions/install_gate.h" 752 #include "chrome/browser/extensions/install_gate.h"
@@ -838,7 +754,7 @@
838 #include "chrome/browser/extensions/pending_extension_manager.h" 754 #include "chrome/browser/extensions/pending_extension_manager.h"
839 #include "chrome/browser/extensions/safe_browsing_verdict_handler.h" 755 #include "chrome/browser/extensions/safe_browsing_verdict_handler.h"
840 #include "chrome/browser/profiles/profile_manager.h" 756 #include "chrome/browser/profiles/profile_manager.h"
841@@ -269,28 +268,11 @@ class ExtensionService : public Extensio 757@@ -276,40 +275,11 @@ class ExtensionService : public Extensio
842 // nothing. 758 // nothing.
843 void EnableExtension(const std::string& extension_id); 759 void EnableExtension(const std::string& extension_id);
844 760
@@ -846,14 +762,26 @@
846- // whether to remove greylist disabled reason. Called when a greylisted 762- // whether to remove greylist disabled reason. Called when a greylisted
847- // state is removed from the Safe Browsing blocklist or Omaha blocklist. Also 763- // state is removed from the Safe Browsing blocklist or Omaha blocklist. Also
848- // clears all acknowledged states if the greylist disabled reason is removed. 764- // clears all acknowledged states if the greylist disabled reason is removed.
849- void ClearGreylistedAcknowledgedStateAndMaybeReenable( 765- void OnGreylistStateRemoved(const std::string& extension_id);
850- const std::string& extension_id);
851- 766-
852- // Takes acknowledged blocklist states into account and decides whether to 767- // Takes acknowledged blocklist states into account and decides whether to
853- // disable the greylisted extension. Called when a new greylisted state is 768- // disable the greylisted extension. Called when a new greylisted state is
854- // added to the Safe Browsing blocklist or Omaha blocklist. 769- // added to the Safe Browsing blocklist or Omaha blocklist.
855- void MaybeDisableGreylistedExtension(const std::string& extension_id, 770- void OnGreylistStateAdded(const std::string& extension_id,
856- BitMapBlocklistState new_state); 771- BitMapBlocklistState new_state);
772-
773- // Takes Safe Browsing and Omaha malware blocklist states into account and
774- // decides whether to remove the extension from the blocklist and reload it.
775- // Called when a blocklisted extension is removed from the Safe Browsing
776- // malware blocklist or Omaha malware blocklist. Also clears the acknowledged
777- // state if the extension is reloaded.
778- void OnBlocklistStateRemoved(const std::string& extension_id);
779-
780- // Takes acknowledged malware blocklist state into account and decides whether
781- // to add the extension to the blocklist and unload it. Called when the
782- // extension is added to the Safe Browsing malware blocklist or the Omaha
783- // malware blocklist.
784- void OnBlocklistStateAdded(const std::string& extension_id);
857- 785-
858 // Removes the disable reason and enable the extension if there are no disable 786 // Removes the disable reason and enable the extension if there are no disable
859 // reasons left and is not blocked for another reason. 787 // reasons left and is not blocked for another reason.
@@ -867,29 +795,17 @@
867 // Disables the extension. If the extension is already disabled, just adds 795 // Disables the extension. If the extension is already disabled, just adds
868 // the |disable_reasons| (a bitmask of disable_reason::DisableReason - there 796 // the |disable_reasons| (a bitmask of disable_reason::DisableReason - there
869 // can be multiple DisableReasons e.g. when an extension comes in disabled 797 // can be multiple DisableReasons e.g. when an extension comes in disabled
870@@ -562,11 +544,6 @@ class ExtensionService : public Extensio 798@@ -649,8 +619,6 @@ class ExtensionService : public Extensio
871 // Helper method to determine if an extension can be blocked.
872 bool CanBlockExtension(const Extension* extension) const;
873
874- // Handles the malware Omaha attribute for remotely disabled extensions.
875- // TODO(crbug.com/1193695): Move this function to OmahaAttributesHandler.
876- void HandleMalwareOmahaAttribute(const std::string& extension_id,
877- const base::Value& attributes);
878-
879 // Enables an extension that was only previously disabled remotely.
880 void MaybeEnableRemotelyDisabledExtension(const std::string& extension_id);
881
882@@ -639,8 +616,6 @@ class ExtensionService : public Extensio
883 799
884 SafeBrowsingVerdictHandler safe_browsing_verdict_handler_; 800 SafeBrowsingVerdictHandler safe_browsing_verdict_handler_;
885 801
886- OmahaAttributesHandler omaha_attributes_handler_; 802- OmahaAttributesHandler omaha_attributes_handler_;
887- 803-
888 // Sets of enabled/disabled/terminated/blocklisted extensions. Not owned. 804 // Sets of enabled/disabled/terminated/blocklisted extensions. Not owned.
889 ExtensionRegistry* registry_ = nullptr; 805 raw_ptr<ExtensionRegistry> registry_ = nullptr;
890 806
891--- chrome/browser/extensions/extension_system_impl.cc.orig 807--- a/chrome/browser/extensions/extension_system_impl.cc
892+++ chrome/browser/extensions/extension_system_impl.cc 808+++ b/chrome/browser/extensions/extension_system_impl.cc
893@@ -465,8 +465,6 @@ void ExtensionSystemImpl::InstallUpdate( 809@@ -465,8 +465,6 @@ void ExtensionSystemImpl::InstallUpdate(
894 void ExtensionSystemImpl::PerformActionBasedOnOmahaAttributes( 810 void ExtensionSystemImpl::PerformActionBasedOnOmahaAttributes(
895 const std::string& extension_id, 811 const std::string& extension_id,
@@ -899,28 +815,42 @@
899 } 815 }
900 816
901 bool ExtensionSystemImpl::FinishDelayedInstallationIfReady( 817 bool ExtensionSystemImpl::FinishDelayedInstallationIfReady(
902--- chrome/browser/extensions/safe_browsing_verdict_handler.cc.orig 818--- a/chrome/browser/extensions/safe_browsing_verdict_handler.cc
903+++ chrome/browser/extensions/safe_browsing_verdict_handler.cc 819+++ b/chrome/browser/extensions/safe_browsing_verdict_handler.cc
904@@ -101,8 +101,6 @@ void SafeBrowsingVerdictHandler::UpdateG 820@@ -119,7 +119,6 @@ void SafeBrowsingVerdictHandler::UpdateB
821 blocklist_.Remove(id);
822 blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
823 id, BitMapBlocklistState::NOT_BLOCKLISTED, extension_prefs_);
824- extension_service_->OnBlocklistStateRemoved(id);
825 UMA_HISTOGRAM_ENUMERATION("ExtensionBlacklist.UnblacklistInstalled",
826 extension->location());
827 }
828@@ -133,7 +132,6 @@ void SafeBrowsingVerdictHandler::UpdateB
829 blocklist_.Insert(extension);
830 blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
831 id, BitMapBlocklistState::BLOCKLISTED_MALWARE, extension_prefs_);
832- extension_service_->OnBlocklistStateAdded(id);
833 UMA_HISTOGRAM_ENUMERATION("ExtensionBlacklist.BlacklistInstalled",
834 extension->location());
835 }
836@@ -157,7 +155,6 @@ void SafeBrowsingVerdictHandler::UpdateG
905 blocklist_prefs::SetSafeBrowsingExtensionBlocklistState( 837 blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
906 extension->id(), BitMapBlocklistState::NOT_BLOCKLISTED, 838 extension->id(), BitMapBlocklistState::NOT_BLOCKLISTED,
907 extension_prefs_); 839 extension_prefs_);
908- extension_service_->ClearGreylistedAcknowledgedStateAndMaybeReenable( 840- extension_service_->OnGreylistStateRemoved(extension->id());
909- extension->id());
910 UMA_HISTOGRAM_ENUMERATION("Extensions.Greylist.Enabled", 841 UMA_HISTOGRAM_ENUMERATION("Extensions.Greylist.Enabled",
911 extension->location()); 842 extension->location());
912 } 843 }
913@@ -125,8 +123,6 @@ void SafeBrowsingVerdictHandler::UpdateG 844@@ -177,7 +174,6 @@ void SafeBrowsingVerdictHandler::UpdateG
914 blocklist_prefs::BlocklistStateToBitMapBlocklistState(greylist_state); 845 blocklist_prefs::BlocklistStateToBitMapBlocklistState(greylist_state);
915 blocklist_prefs::SetSafeBrowsingExtensionBlocklistState( 846 blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
916 extension->id(), bitmap_greylist_state, extension_prefs_); 847 extension->id(), bitmap_greylist_state, extension_prefs_);
917- extension_service_->MaybeDisableGreylistedExtension(id, 848- extension_service_->OnGreylistStateAdded(id, bitmap_greylist_state);
918- bitmap_greylist_state);
919 UMA_HISTOGRAM_ENUMERATION("Extensions.Greylist.Disabled", 849 UMA_HISTOGRAM_ENUMERATION("Extensions.Greylist.Disabled",
920 extension->location()); 850 extension->location());
921 } 851 }
922--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 852--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
923+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc 853+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
924@@ -35,8 +35,6 @@ 854@@ -35,8 +35,6 @@
925 #include "chrome/browser/file_system_access/file_system_access_permission_request_manager.h" 855 #include "chrome/browser/file_system_access/file_system_access_permission_request_manager.h"
926 #include "chrome/browser/installable/installable_utils.h" 856 #include "chrome/browser/installable/installable_utils.h"
@@ -930,7 +860,7 @@
930 #include "chrome/browser/ui/file_system_access_dialogs.h" 860 #include "chrome/browser/ui/file_system_access_dialogs.h"
931 #include "chrome/common/chrome_paths.h" 861 #include "chrome/common/chrome_paths.h"
932 #include "components/content_settings/core/browser/host_content_settings_map.h" 862 #include "components/content_settings/core/browser/host_content_settings_map.h"
933@@ -299,83 +297,6 @@ BindResultCallbackToCurrentSequence( 863@@ -305,83 +303,6 @@ BindResultCallbackToCurrentSequence(
934 base::SequencedTaskRunnerHandle::Get(), std::move(callback)); 864 base::SequencedTaskRunnerHandle::Get(), std::move(callback));
935 } 865 }
936 866
@@ -1014,7 +944,7 @@
1014 std::string GenerateLastPickedDirectoryKey(const std::string& id) { 944 std::string GenerateLastPickedDirectoryKey(const std::string& id) {
1015 return id.empty() ? kDefaultLastPickedDirectoryKey 945 return id.empty() ? kDefaultLastPickedDirectoryKey
1016 : base::StrCat({kCustomLastPickedDirectoryKey, "-", id}); 946 : base::StrCat({kCustomLastPickedDirectoryKey, "-", id});
1017@@ -1106,28 +1027,6 @@ void ChromeFileSystemAccessPermissionCon 947@@ -1137,28 +1058,6 @@ void ChromeFileSystemAccessPermissionCon
1018 std::move(callback))); 948 std::move(callback)));
1019 } 949 }
1020 950
@@ -1043,9 +973,9 @@
1043 void ChromeFileSystemAccessPermissionContext:: 973 void ChromeFileSystemAccessPermissionContext::
1044 DidConfirmSensitiveDirectoryAccess( 974 DidConfirmSensitiveDirectoryAccess(
1045 const url::Origin& origin, 975 const url::Origin& origin,
1046--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.h.orig 976--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
1047+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.h 977+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
1048@@ -85,10 +85,6 @@ class ChromeFileSystemAccessPermissionCo 978@@ -86,10 +86,6 @@ class ChromeFileSystemAccessPermissionCo
1049 HandleType handle_type, 979 HandleType handle_type,
1050 content::GlobalRenderFrameHostId frame_id, 980 content::GlobalRenderFrameHostId frame_id,
1051 base::OnceCallback<void(SensitiveDirectoryResult)> callback) override; 981 base::OnceCallback<void(SensitiveDirectoryResult)> callback) override;
@@ -1056,9 +986,9 @@
1056 bool CanObtainReadPermission(const url::Origin& origin) override; 986 bool CanObtainReadPermission(const url::Origin& origin) override;
1057 bool CanObtainWritePermission(const url::Origin& origin) override; 987 bool CanObtainWritePermission(const url::Origin& origin) override;
1058 988
1059--- chrome/browser/media/webrtc/display_media_access_handler.cc.orig 989--- a/chrome/browser/media/webrtc/display_media_access_handler.cc
1060+++ chrome/browser/media/webrtc/display_media_access_handler.cc 990+++ b/chrome/browser/media/webrtc/display_media_access_handler.cc
1061@@ -25,6 +25,7 @@ 991@@ -23,6 +23,7 @@
1062 #include "chrome/browser/safe_browsing/user_interaction_observer.h" 992 #include "chrome/browser/safe_browsing/user_interaction_observer.h"
1063 #include "chrome/common/pref_names.h" 993 #include "chrome/common/pref_names.h"
1064 #include "components/prefs/pref_service.h" 994 #include "components/prefs/pref_service.h"
@@ -1066,7 +996,7 @@
1066 #include "components/url_formatter/elide_url.h" 996 #include "components/url_formatter/elide_url.h"
1067 #include "content/public/browser/browser_thread.h" 997 #include "content/public/browser/browser_thread.h"
1068 #include "content/public/browser/desktop_capture.h" 998 #include "content/public/browser/desktop_capture.h"
1069@@ -111,6 +112,7 @@ void DisplayMediaAccessHandler::HandleRe 999@@ -106,6 +107,7 @@ void DisplayMediaAccessHandler::HandleRe
1070 return; 1000 return;
1071 } 1001 }
1072 1002
@@ -1074,25 +1004,41 @@
1074 // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing 1004 // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
1075 // warnings until user interaction. If the current page has a delayed warning, 1005 // warnings until user interaction. If the current page has a delayed warning,
1076 // it'll have a user interaction observer attached. Show the warning 1006 // it'll have a user interaction observer attached. Show the warning
1077@@ -125,6 +127,7 @@ void DisplayMediaAccessHandler::HandleRe 1007@@ -121,6 +123,7 @@ void DisplayMediaAccessHandler::HandleRe
1078 observer->OnDesktopCaptureRequest(); 1008 observer->OnDesktopCaptureRequest();
1079 return; 1009 return;
1080 } 1010 }
1081+ #endif // BUILDFLAG(FULL_SAFE_BROWSING) 1011+ #endif // BUILDFLAG(FULL_SAFE_BROWSING)
1082 1012
1083 #if defined(OS_MAC) 1013 #if BUILDFLAG(IS_MAC)
1084 // Do not allow picker UI to be shown on a page that isn't in the foreground 1014 // Do not allow picker UI to be shown on a page that isn't in the foreground
1085--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 1015--- a/chrome/browser/notifications/notification_display_service_impl.cc
1086+++ chrome/browser/password_manager/chrome_password_manager_client.cc 1016+++ b/chrome/browser/notifications/notification_display_service_impl.cc
1017@@ -88,13 +88,6 @@ NotificationDisplayServiceImpl::Notifica
1018 profile_));
1019 #endif
1020
1021-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
1022- BUILDFLAG(IS_WIN)
1023- AddNotificationHandler(
1024- NotificationHandler::Type::TAILORED_SECURITY,
1025- std::make_unique<safe_browsing::TailoredSecurityNotificationHandler>());
1026-#endif
1027-
1028 #if BUILDFLAG(ENABLE_EXTENSIONS)
1029 AddNotificationHandler(
1030 NotificationHandler::Type::EXTENSION,
1031--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
1032+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
1087@@ -33,7 +33,6 @@ 1033@@ -33,7 +33,6 @@
1088 #include "chrome/browser/password_manager/password_reuse_manager_factory.h" 1034 #include "chrome/browser/password_manager/password_scripts_fetcher_factory.h"
1089 #include "chrome/browser/password_manager/password_store_factory.h" 1035 #include "chrome/browser/password_manager/password_store_factory.h"
1090 #include "chrome/browser/profiles/profile.h" 1036 #include "chrome/browser/profiles/profile.h"
1091-#include "chrome/browser/safe_browsing/chrome_password_protection_service.h" 1037-#include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
1092 #include "chrome/browser/safe_browsing/user_interaction_observer.h" 1038 #include "chrome/browser/safe_browsing/user_interaction_observer.h"
1093 #include "chrome/browser/signin/identity_manager_factory.h" 1039 #include "chrome/browser/signin/identity_manager_factory.h"
1094 #include "chrome/browser/sync/sync_service_factory.h" 1040 #include "chrome/browser/sync/sync_service_factory.h"
1095@@ -110,11 +109,11 @@ 1041@@ -114,11 +113,11 @@
1096 #if BUILDFLAG(FULL_SAFE_BROWSING) 1042 #if BUILDFLAG(FULL_SAFE_BROWSING)
1097 #include "chrome/browser/safe_browsing/advanced_protection_status_manager.h" 1043 #include "chrome/browser/safe_browsing/advanced_protection_status_manager.h"
1098 #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h" 1044 #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h"
@@ -1103,9 +1049,9 @@
1103 #include "ui/events/keycodes/keyboard_codes.h" 1049 #include "ui/events/keycodes/keyboard_codes.h"
1104-#endif 1050-#endif
1105 1051
1106 #if defined(OS_ANDROID) 1052 #if BUILDFLAG(IS_ANDROID)
1107 #include "chrome/browser/android/tab_android.h" 1053 #include "chrome/browser/android/tab_android.h"
1108@@ -826,6 +825,7 @@ autofill::LanguageCode ChromePasswordMan 1054@@ -850,6 +849,7 @@ autofill::LanguageCode ChromePasswordMan
1109 return autofill::LanguageCode(); 1055 return autofill::LanguageCode();
1110 } 1056 }
1111 1057
@@ -1113,45 +1059,59 @@
1113 safe_browsing::PasswordProtectionService* 1059 safe_browsing::PasswordProtectionService*
1114 ChromePasswordManagerClient::GetPasswordProtectionService() const { 1060 ChromePasswordManagerClient::GetPasswordProtectionService() const {
1115 return safe_browsing::ChromePasswordProtectionService:: 1061 return safe_browsing::ChromePasswordProtectionService::
1116@@ -836,13 +836,6 @@ ChromePasswordManagerClient::GetPassword 1062@@ -885,13 +885,9 @@ void ChromePasswordManagerClient::CheckP
1117 void ChromePasswordManagerClient::CheckSafeBrowsingReputation( 1063 web_contents(), web_contents()->GetLastCommittedURL(), username,
1118 const GURL& form_action, 1064 password_type, matching_reused_credentials, password_field_exists);
1119 const GURL& frame_url) { 1065 }
1066+#endif // BUILDFLAG(FULL_SAFE_BROWSING)
1067
1068 void ChromePasswordManagerClient::LogPasswordReuseDetectedEvent() {
1120- safe_browsing::PasswordProtectionService* pps = 1069- safe_browsing::PasswordProtectionService* pps =
1121- GetPasswordProtectionService(); 1070- GetPasswordProtectionService();
1122- if (pps) { 1071- if (pps) {
1123- pps->MaybeStartPasswordFieldOnFocusRequest( 1072- pps->MaybeLogPasswordReuseDetectedEvent(web_contents());
1124- web_contents(), web_contents()->GetLastCommittedURL(), form_action,
1125- frame_url, pps->GetAccountInfo().hosted_domain);
1126- } 1073- }
1127 } 1074 }
1128 #endif // defined(ON_FOCUS_PING_ENABLED)
1129 1075
1130@@ -852,22 +845,10 @@ void ChromePasswordManagerClient::CheckP 1076 #if !BUILDFLAG(IS_ANDROID)
1131 const std::vector<password_manager::MatchingReusedCredential>& 1077@@ -900,36 +896,10 @@ void ChromePasswordManagerClient::MaybeR
1132 matching_reused_credentials, 1078 bool is_federated,
1133 bool password_field_exists) { 1079 const url::Origin& federated_origin,
1134- safe_browsing::PasswordProtectionService* pps = 1080 const std::u16string& login_user_name) const {
1135- GetPasswordProtectionService(); 1081- if (!base::FeatureList::IsEnabled(policy::features::kLoginEventReporting))
1136- if (!pps) 1082- return;
1083-
1084- extensions::SafeBrowsingPrivateEventRouter* router =
1085- extensions::SafeBrowsingPrivateEventRouterFactory::GetForProfile(
1086- profile_);
1087- if (!router)
1137- return; 1088- return;
1138- 1089-
1139- pps->MaybeStartProtectedPasswordEntryRequest( 1090- // The router is responsible for checking if the reporting of this event type
1140- web_contents(), web_contents()->GetLastCommittedURL(), username, 1091- // is enabled by the admin.
1141- password_type, matching_reused_credentials, password_field_exists); 1092- router->OnLoginEvent(url, is_federated, federated_origin, login_user_name);
1142 } 1093 }
1143+#endif // BUILDFLAG(FULL_SAFE_BROWSING)
1144 1094
1145 void ChromePasswordManagerClient::LogPasswordReuseDetectedEvent() { 1095 void ChromePasswordManagerClient::MaybeReportEnterprisePasswordBreachEvent(
1146- safe_browsing::PasswordProtectionService* pps = 1096 const std::vector<std::pair<GURL, std::u16string>>& identities) const {
1147- GetPasswordProtectionService(); 1097- if (!base::FeatureList::IsEnabled(
1148- if (pps) { 1098- policy::features::kPasswordBreachEventReporting)) {
1149- pps->MaybeLogPasswordReuseDetectedEvent(web_contents()); 1099- return;
1150- } 1100- }
1101-
1102- extensions::SafeBrowsingPrivateEventRouter* router =
1103- extensions::SafeBrowsingPrivateEventRouterFactory::GetForProfile(
1104- profile_);
1105- if (!router)
1106- return;
1107-
1108- // The router is responsible for checking if the reporting of this event type
1109- // is enabled by the admin.
1110- router->OnPasswordBreach(kPasswordBreachEntryTrigger, identities);
1151 } 1111 }
1112 #endif
1152 1113
1153 #if !defined(OS_ANDROID) 1114@@ -1398,9 +1368,11 @@ void ChromePasswordManagerClient::OnPast
1154@@ -1365,9 +1346,11 @@ void ChromePasswordManagerClient::OnPast
1155 } 1115 }
1156 1116
1157 was_on_paste_called_ = true; 1117 was_on_paste_called_ = true;
@@ -1160,11 +1120,11 @@
1160+#endif // defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED) 1120+#endif // defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
1161 } 1121 }
1162-#endif 1122-#endif
1163+#endif // !defined(OS_ANDROID) 1123+#endif // !BUILDFLAG(IS_ANDROID)
1164 1124
1165 void ChromePasswordManagerClient::RenderFrameCreated( 1125 void ChromePasswordManagerClient::RenderFrameCreated(
1166 content::RenderFrameHost* render_frame_host) { 1126 content::RenderFrameHost* render_frame_host) {
1167@@ -1402,7 +1385,9 @@ void ChromePasswordManagerClient::OnInpu 1127@@ -1435,7 +1407,9 @@ void ChromePasswordManagerClient::OnInpu
1168 if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) { 1128 if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) {
1169 OnPaste(); 1129 OnPaste();
1170 } else { 1130 } else {
@@ -1172,9 +1132,9 @@
1172 password_reuse_detection_manager_.OnKeyPressedCommitted(key_event.text); 1132 password_reuse_detection_manager_.OnKeyPressedCommitted(key_event.text);
1173+#endif // defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED) 1133+#endif // defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
1174 } 1134 }
1175 #endif // defined(OS_ANDROID) 1135 #endif // BUILDFLAG(IS_ANDROID)
1176 } 1136 }
1177@@ -1441,6 +1426,7 @@ bool ChromePasswordManagerClient::IsPass 1137@@ -1474,6 +1448,7 @@ bool ChromePasswordManagerClient::IsPass
1178 is_enabled = false; 1138 is_enabled = false;
1179 } 1139 }
1180 1140
@@ -1182,7 +1142,7 @@
1182 // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing 1142 // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
1183 // warnings until user interaction. If the current page has a delayed warning, 1143 // warnings until user interaction. If the current page has a delayed warning,
1184 // it'll have a user interaction observer attached. Disable password 1144 // it'll have a user interaction observer attached. Disable password
1185@@ -1451,6 +1437,7 @@ bool ChromePasswordManagerClient::IsPass 1145@@ -1484,6 +1459,7 @@ bool ChromePasswordManagerClient::IsPass
1186 observer->OnPasswordSaveOrAutofillDenied(); 1146 observer->OnPasswordSaveOrAutofillDenied();
1187 is_enabled = false; 1147 is_enabled = false;
1188 } 1148 }
@@ -1190,9 +1150,9 @@
1190 1150
1191 if (log_manager_->IsLoggingActive()) { 1151 if (log_manager_->IsLoggingActive()) {
1192 password_manager::BrowserSavePasswordProgressLogger logger( 1152 password_manager::BrowserSavePasswordProgressLogger logger(
1193--- chrome/browser/password_manager/chrome_password_manager_client.h.orig 1153--- a/chrome/browser/password_manager/chrome_password_manager_client.h
1194+++ chrome/browser/password_manager/chrome_password_manager_client.h 1154+++ b/chrome/browser/password_manager/chrome_password_manager_client.h
1195@@ -207,13 +207,14 @@ class ChromePasswordManagerClient 1155@@ -216,13 +216,14 @@ class ChromePasswordManagerClient
1196 void AnnotateNavigationEntry(bool has_password_field) override; 1156 void AnnotateNavigationEntry(bool has_password_field) override;
1197 autofill::LanguageCode GetPageLanguage() const override; 1157 autofill::LanguageCode GetPageLanguage() const override;
1198 1158
@@ -1208,7 +1168,7 @@
1208 1168
1209 void CheckProtectedPasswordEntry( 1169 void CheckProtectedPasswordEntry(
1210 password_manager::metrics_util::PasswordType reused_password_type, 1170 password_manager::metrics_util::PasswordType reused_password_type,
1211@@ -221,6 +222,7 @@ class ChromePasswordManagerClient 1171@@ -230,6 +231,7 @@ class ChromePasswordManagerClient
1212 const std::vector<password_manager::MatchingReusedCredential>& 1172 const std::vector<password_manager::MatchingReusedCredential>&
1213 matching_reused_credentials, 1173 matching_reused_credentials,
1214 bool password_field_exists) override; 1174 bool password_field_exists) override;
@@ -1216,8 +1176,8 @@
1216 1176
1217 void LogPasswordReuseDetectedEvent() override; 1177 void LogPasswordReuseDetectedEvent() override;
1218 1178
1219--- chrome/browser/permissions/abusive_origin_permission_revocation_request.cc.orig 1179--- a/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc
1220+++ chrome/browser/permissions/abusive_origin_permission_revocation_request.cc 1180+++ b/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc
1221@@ -136,6 +136,7 @@ void AbusiveOriginPermissionRevocationRe 1181@@ -136,6 +136,7 @@ void AbusiveOriginPermissionRevocationRe
1222 DCHECK(profile_); 1182 DCHECK(profile_);
1223 DCHECK(callback_); 1183 DCHECK(callback_);
@@ -1234,9 +1194,9 @@
1234 } 1194 }
1235 1195
1236 void AbusiveOriginPermissionRevocationRequest::OnSafeBrowsingVerdictReceived( 1196 void AbusiveOriginPermissionRevocationRequest::OnSafeBrowsingVerdictReceived(
1237--- chrome/browser/permissions/contextual_notification_permission_ui_selector.cc.orig 1197--- a/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
1238+++ chrome/browser/permissions/contextual_notification_permission_ui_selector.cc 1198+++ b/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
1239@@ -17,7 +17,6 @@ 1199@@ -16,7 +16,6 @@
1240 #include "chrome/browser/browser_process.h" 1200 #include "chrome/browser/browser_process.h"
1241 #include "chrome/browser/permissions/quiet_notification_permission_ui_config.h" 1201 #include "chrome/browser/permissions/quiet_notification_permission_ui_config.h"
1242 #include "chrome/browser/permissions/quiet_notification_permission_ui_state.h" 1202 #include "chrome/browser/permissions/quiet_notification_permission_ui_state.h"
@@ -1244,7 +1204,7 @@
1244 #include "chrome/common/chrome_features.h" 1204 #include "chrome/common/chrome_features.h"
1245 #include "components/permissions/permission_request.h" 1205 #include "components/permissions/permission_request.h"
1246 #include "components/permissions/request_type.h" 1206 #include "components/permissions/request_type.h"
1247@@ -151,9 +150,6 @@ void ContextualNotificationPermissionUiS 1207@@ -150,9 +149,6 @@ void ContextualNotificationPermissionUiS
1248 } 1208 }
1249 1209
1250 void ContextualNotificationPermissionUiSelector::Cancel() { 1210 void ContextualNotificationPermissionUiSelector::Cancel() {
@@ -1254,7 +1214,7 @@
1254 } 1214 }
1255 1215
1256 bool ContextualNotificationPermissionUiSelector::IsPermissionRequestSupported( 1216 bool ContextualNotificationPermissionUiSelector::IsPermissionRequestSupported(
1257@@ -179,24 +175,14 @@ void ContextualNotificationPermissionUiS 1217@@ -178,24 +174,14 @@ void ContextualNotificationPermissionUiS
1258 absl::optional<Decision> decision = 1218 absl::optional<Decision> decision =
1259 GetDecisionBasedOnSiteReputation(reputation); 1219 GetDecisionBasedOnSiteReputation(reputation);
1260 1220
@@ -1284,23 +1244,92 @@
1284 } 1244 }
1285 1245
1286 void ContextualNotificationPermissionUiSelector::OnSafeBrowsingVerdictReceived( 1246 void ContextualNotificationPermissionUiSelector::OnSafeBrowsingVerdictReceived(
1287--- chrome/browser/permissions/prediction_based_permission_ui_selector.cc.orig 1247--- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
1288+++ chrome/browser/permissions/prediction_based_permission_ui_selector.cc 1248+++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
1289@@ -212,10 +212,8 @@ bool PredictionBasedPermissionUiSelector 1249@@ -322,47 +322,5 @@ bool PredictionBasedPermissionUiSelector
1250
1251 PredictionSource PredictionBasedPermissionUiSelector::GetPredictionTypeToUse(
1290 permissions::RequestType request_type) { 1252 permissions::RequestType request_type) {
1291 // We need to also check `kQuietNotificationPrompts` here since there is no 1253- if (!safe_browsing::IsSafeBrowsingEnabled(*(profile_->GetPrefs()))) {
1292 // generic safeguard anywhere else in the stack. 1254 return PredictionSource::USE_NONE;
1293- if (!base::FeatureList::IsEnabled(features::kQuietNotificationPrompts) || 1255- }
1294- !safe_browsing::IsSafeBrowsingEnabled(*(profile_->GetPrefs()))) { 1256-
1295+ if (!base::FeatureList::IsEnabled(features::kQuietNotificationPrompts)) 1257- bool is_server_side_prediction_enabled = false;
1296 return false; 1258- bool is_ondevice_prediction_enabled = false;
1259-
1260- bool is_tflite_available = false;
1261-#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
1262- is_tflite_available = true;
1263-#endif // BUILDFLAG(BUILD_WITH_TFLITE_LIB)
1264-
1265- // Notification supports both flavours of the quiet prompt
1266- if (request_type == permissions::RequestType::kNotifications &&
1267- (base::FeatureList::IsEnabled(features::kQuietNotificationPrompts) ||
1268- base::FeatureList::IsEnabled(
1269- permissions::features::kPermissionQuietChip))) {
1270- is_server_side_prediction_enabled =
1271- base::FeatureList::IsEnabled(features::kPermissionPredictions);
1272-
1273- is_ondevice_prediction_enabled =
1274- is_tflite_available &&
1275- base::FeatureList::IsEnabled(
1276- permissions::features::kPermissionOnDeviceNotificationPredictions);
1277- }
1278-
1279- // Geolocation supports only the quiet chip ui
1280- if (request_type == permissions::RequestType::kGeolocation &&
1281- base::FeatureList::IsEnabled(
1282- permissions::features::kPermissionQuietChip)) {
1283- is_server_side_prediction_enabled = base::FeatureList::IsEnabled(
1284- features::kPermissionGeolocationPredictions);
1285- }
1286-
1287- if (is_server_side_prediction_enabled && is_ondevice_prediction_enabled) {
1288- return PredictionSource::USE_ANY;
1289- } else if (is_server_side_prediction_enabled) {
1290- return PredictionSource::USE_SERVER_SIDE;
1291- } else if (is_ondevice_prediction_enabled) {
1292- return PredictionSource::USE_ONDEVICE;
1293- } else {
1294- return PredictionSource::USE_NONE;
1297- } 1295- }
1298 double hold_back_chance = 0.0; 1296 }
1299 bool is_permissions_predictions_enabled = false; 1297--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
1300 switch (request_type) { 1298+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
1301--- chrome/browser/prefs/browser_prefs.cc.orig 1299@@ -92,6 +92,7 @@
1302+++ chrome/browser/prefs/browser_prefs.cc 1300 #include "components/policy/core/common/schema.h"
1303@@ -243,7 +243,6 @@ 1301 #include "components/policy/policy_constants.h"
1302 #include "components/proxy_config/proxy_policy_handler.h"
1303+#include "components/safe_browsing/buildflags.h"
1304 #include "components/safe_browsing/content/common/file_type_policies_prefs.h"
1305 #include "components/safe_browsing/core/common/safe_browsing_policy_handler.h"
1306 #include "components/safe_browsing/core/common/safe_browsing_prefs.h"
1307@@ -1732,8 +1733,6 @@ std::unique_ptr<ConfigurationPolicyHandl
1308 handlers->AddHandler(
1309 std::make_unique<bookmarks::ManagedBookmarksPolicyHandler>(
1310 chrome_schema));
1311- handlers->AddHandler(
1312- std::make_unique<safe_browsing::SafeBrowsingPolicyHandler>());
1313 handlers->AddHandler(std::make_unique<syncer::SyncPolicyHandler>());
1314 handlers->AddHandler(
1315 std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
1316@@ -1790,13 +1789,6 @@ std::unique_ptr<ConfigurationPolicyHandl
1317 prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode,
1318 prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope, chrome_schema));
1319
1320- handlers->AddHandler(std::make_unique<SimpleSchemaValidatingPolicyHandler>(
1321- key::kExemptDomainFileTypePairsFromFileTypeDownloadWarnings,
1322- safe_browsing::file_type::prefs::
1323- kExemptDomainFileTypePairsFromFileTypeDownloadWarnings,
1324- chrome_schema, SCHEMA_ALLOW_UNKNOWN,
1325- SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED,
1326- SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED));
1327 handlers->AddHandler(
1328 std::make_unique<ManagedAccountRestrictionsPolicyHandler>(chrome_schema));
1329
1330--- a/chrome/browser/prefs/browser_prefs.cc
1331+++ b/chrome/browser/prefs/browser_prefs.cc
1332@@ -248,7 +248,6 @@
1304 #include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h" 1333 #include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h"
1305 #include "chrome/browser/new_tab_page/modules/drive/drive_service.h" 1334 #include "chrome/browser/new_tab_page/modules/drive/drive_service.h"
1306 #include "chrome/browser/new_tab_page/modules/photos/photos_service.h" 1335 #include "chrome/browser/new_tab_page/modules/photos/photos_service.h"
@@ -1308,7 +1337,7 @@
1308 #include "chrome/browser/new_tab_page/modules/task_module/task_module_service.h" 1337 #include "chrome/browser/new_tab_page/modules/task_module/task_module_service.h"
1309 #include "chrome/browser/new_tab_page/promos/promo_service.h" 1338 #include "chrome/browser/new_tab_page/promos/promo_service.h"
1310 #include "chrome/browser/search/background/ntp_custom_background_service.h" 1339 #include "chrome/browser/search/background/ntp_custom_background_service.h"
1311@@ -1277,7 +1276,6 @@ void RegisterProfilePrefs(user_prefs::Pr 1340@@ -1386,7 +1385,6 @@ void RegisterProfilePrefs(user_prefs::Pr
1312 NewTabPageHandler::RegisterProfilePrefs(registry); 1341 NewTabPageHandler::RegisterProfilePrefs(registry);
1313 NewTabPageUI::RegisterProfilePrefs(registry); 1342 NewTabPageUI::RegisterProfilePrefs(registry);
1314 NewTabUI::RegisterProfilePrefs(registry); 1343 NewTabUI::RegisterProfilePrefs(registry);
@@ -1316,8 +1345,18 @@
1316 ntp_tiles::CustomLinksManagerImpl::RegisterProfilePrefs(registry); 1345 ntp_tiles::CustomLinksManagerImpl::RegisterProfilePrefs(registry);
1317 PhotosService::RegisterProfilePrefs(registry); 1346 PhotosService::RegisterProfilePrefs(registry);
1318 PinnedTabCodec::RegisterProfilePrefs(registry); 1347 PinnedTabCodec::RegisterProfilePrefs(registry);
1319--- chrome/browser/reputation/reputation_service.cc.orig 1348--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
1320+++ chrome/browser/reputation/reputation_service.cc 1349+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
1350@@ -536,7 +536,6 @@ void ChromeBrowserMainExtraPartsProfiles
1351 SystemExtensionsProviderFactory::GetInstance();
1352 #endif
1353 TabRestoreServiceFactory::GetInstance();
1354- safe_browsing::TailoredSecurityServiceFactory::GetInstance();
1355 TemplateURLFetcherFactory::GetInstance();
1356 TemplateURLServiceFactory::GetInstance();
1357 #if !BUILDFLAG(IS_ANDROID)
1358--- a/chrome/browser/reputation/reputation_service.cc
1359+++ b/chrome/browser/reputation/reputation_service.cc
1321@@ -120,9 +120,7 @@ void ReputationService::GetReputationSta 1360@@ -120,9 +120,7 @@ void ReputationService::GetReputationSta
1322 ReputationCheckCallback callback) { 1361 ReputationCheckCallback callback) {
1323 DCHECK(url.SchemeIsHTTPOrHTTPS()); 1362 DCHECK(url.SchemeIsHTTPOrHTTPS());
@@ -1329,8 +1368,18 @@
1329 1368
1330 LookalikeUrlService* service = LookalikeUrlService::Get(profile_); 1369 LookalikeUrlService* service = LookalikeUrlService::Get(profile_);
1331 if (service->EngagedSitesNeedUpdating()) { 1370 if (service->EngagedSitesNeedUpdating()) {
1332--- chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc.orig 1371--- a/chrome/browser/resources/settings/privacy_page/privacy_guide/privacy_guide_page.ts
1333+++ chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc 1372+++ b/chrome/browser/resources/settings/privacy_page/privacy_guide/privacy_guide_page.ts
1373@@ -17,7 +17,6 @@ import './privacy_guide_completion_fragm
1374 import './privacy_guide_cookies_fragment.js';
1375 import './privacy_guide_history_sync_fragment.js';
1376 import './privacy_guide_msbb_fragment.js';
1377-import './privacy_guide_safe_browsing_fragment.js';
1378 import './privacy_guide_welcome_fragment.js';
1379 import './step_indicator.js';
1380
1381--- a/chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc
1382+++ b/chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc
1334@@ -17,15 +17,6 @@ SafeBrowsingMetricsProvider::~SafeBrowsi 1383@@ -17,15 +17,6 @@ SafeBrowsingMetricsProvider::~SafeBrowsi
1335 1384
1336 void SafeBrowsingMetricsProvider::ProvideCurrentSessionData( 1385 void SafeBrowsingMetricsProvider::ProvideCurrentSessionData(
@@ -1347,8 +1396,8 @@
1347 } 1396 }
1348 1397
1349 } // namespace safe_browsing 1398 } // namespace safe_browsing
1350--- chrome/browser/safe_browsing/url_lookup_service_factory.cc.orig 1399--- a/chrome/browser/safe_browsing/url_lookup_service_factory.cc
1351+++ chrome/browser/safe_browsing/url_lookup_service_factory.cc 1400+++ b/chrome/browser/safe_browsing/url_lookup_service_factory.cc
1352@@ -59,28 +59,7 @@ RealTimeUrlLookupServiceFactory::RealTim 1401@@ -59,28 +59,7 @@ RealTimeUrlLookupServiceFactory::RealTim
1353 1402
1354 KeyedService* RealTimeUrlLookupServiceFactory::BuildServiceInstanceFor( 1403 KeyedService* RealTimeUrlLookupServiceFactory::BuildServiceInstanceFor(
@@ -1379,9 +1428,9 @@
1379 } 1428 }
1380 1429
1381 } // namespace safe_browsing 1430 } // namespace safe_browsing
1382--- chrome/browser/ssl/chrome_security_blocking_page_factory.cc.orig 1431--- a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
1383+++ chrome/browser/ssl/chrome_security_blocking_page_factory.cc 1432+++ b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
1384@@ -142,15 +142,6 @@ CreateSettingsPageHelper() { 1433@@ -143,15 +143,6 @@ CreateSettingsPageHelper() {
1385 CreateChromeSettingsPageHelper(); 1434 CreateChromeSettingsPageHelper();
1386 } 1435 }
1387 1436
@@ -1397,9 +1446,9 @@
1397 } // namespace 1446 } // namespace
1398 1447
1399 std::unique_ptr<SSLBlockingPage> 1448 std::unique_ptr<SSLBlockingPage>
1400@@ -192,10 +183,6 @@ ChromeSecurityBlockingPageFactory::Creat 1449@@ -175,10 +166,6 @@ ChromeSecurityBlockingPageFactory::Creat
1401 } 1450 Profile::FromBrowserContext(web_contents->GetBrowserContext()));
1402 } 1451 state->DidDisplayErrorPage(cert_error);
1403 1452
1404- LogSafeBrowsingSecuritySensitiveAction( 1453- LogSafeBrowsingSecuritySensitiveAction(
1405- safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile( 1454- safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
@@ -1408,18 +1457,7 @@
1408 auto controller_client = std::make_unique<SSLErrorControllerClient>( 1457 auto controller_client = std::make_unique<SSLErrorControllerClient>(
1409 web_contents, ssl_info, cert_error, request_url, 1458 web_contents, ssl_info, cert_error, request_url,
1410 std::move(metrics_helper), CreateSettingsPageHelper()); 1459 std::move(metrics_helper), CreateSettingsPageHelper());
1411@@ -264,10 +251,6 @@ ChromeSecurityBlockingPageFactory::Creat 1460@@ -248,10 +235,6 @@ ChromeSecurityBlockingPageFactory::Creat
1412 const GURL& request_url,
1413 std::unique_ptr<SSLCertReporter> ssl_cert_reporter,
1414 const net::SSLInfo& ssl_info) {
1415- LogSafeBrowsingSecuritySensitiveAction(
1416- safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
1417- Profile::FromBrowserContext(web_contents->GetBrowserContext())));
1418-
1419 auto page = std::make_unique<LegacyTLSBlockingPage>(
1420 web_contents, cert_error, request_url, std::move(ssl_cert_reporter),
1421 /*can_show_enhanced_protection_message=*/true, ssl_info,
1422@@ -289,10 +272,6 @@ ChromeSecurityBlockingPageFactory::Creat
1423 std::unique_ptr<SSLCertReporter> ssl_cert_reporter, 1461 std::unique_ptr<SSLCertReporter> ssl_cert_reporter,
1424 const net::SSLInfo& ssl_info, 1462 const net::SSLInfo& ssl_info,
1425 const std::string& mitm_software_name) { 1463 const std::string& mitm_software_name) {
@@ -1430,7 +1468,7 @@
1430 auto page = std::make_unique<MITMSoftwareBlockingPage>( 1468 auto page = std::make_unique<MITMSoftwareBlockingPage>(
1431 web_contents, cert_error, request_url, std::move(ssl_cert_reporter), 1469 web_contents, cert_error, request_url, std::move(ssl_cert_reporter),
1432 /*can_show_enhanced_protection_message=*/true, ssl_info, 1470 /*can_show_enhanced_protection_message=*/true, ssl_info,
1433@@ -314,10 +293,6 @@ ChromeSecurityBlockingPageFactory::Creat 1471@@ -273,10 +256,6 @@ ChromeSecurityBlockingPageFactory::Creat
1434 const GURL& request_url, 1472 const GURL& request_url,
1435 std::unique_ptr<SSLCertReporter> ssl_cert_reporter, 1473 std::unique_ptr<SSLCertReporter> ssl_cert_reporter,
1436 const net::SSLInfo& ssl_info) { 1474 const net::SSLInfo& ssl_info) {
@@ -1441,8 +1479,8 @@
1441 auto page = std::make_unique<BlockedInterceptionBlockingPage>( 1479 auto page = std::make_unique<BlockedInterceptionBlockingPage>(
1442 web_contents, cert_error, request_url, std::move(ssl_cert_reporter), 1480 web_contents, cert_error, request_url, std::move(ssl_cert_reporter),
1443 /*can_show_enhanced_protection_message=*/true, ssl_info, 1481 /*can_show_enhanced_protection_message=*/true, ssl_info,
1444--- chrome/browser/ssl/sct_reporting_service_factory.cc.orig 1482--- a/chrome/browser/ssl/sct_reporting_service_factory.cc
1445+++ chrome/browser/ssl/sct_reporting_service_factory.cc 1483+++ b/chrome/browser/ssl/sct_reporting_service_factory.cc
1446@@ -32,15 +32,7 @@ SCTReportingServiceFactory::~SCTReportin 1484@@ -32,15 +32,7 @@ SCTReportingServiceFactory::~SCTReportin
1447 1485
1448 KeyedService* SCTReportingServiceFactory::BuildServiceInstanceFor( 1486 KeyedService* SCTReportingServiceFactory::BuildServiceInstanceFor(
@@ -1460,8 +1498,19 @@
1460 } 1498 }
1461 1499
1462 content::BrowserContext* SCTReportingServiceFactory::GetBrowserContextToUse( 1500 content::BrowserContext* SCTReportingServiceFactory::GetBrowserContextToUse(
1463--- chrome/browser/subresource_filter/chrome_content_subresource_filter_web_contents_helper_factory.cc.orig 1501--- a/chrome/browser/ssl/ssl_error_controller_client.cc
1464+++ chrome/browser/subresource_filter/chrome_content_subresource_filter_web_contents_helper_factory.cc 1502+++ b/chrome/browser/ssl/ssl_error_controller_client.cc
1503@@ -91,8 +91,6 @@ void SSLErrorControllerClient::GoBack()
1504 }
1505
1506 void SSLErrorControllerClient::Proceed() {
1507- MaybeTriggerSecurityInterstitialProceededEvent(web_contents_, request_url_,
1508- "SSL_ERROR", cert_error_);
1509 #if BUILDFLAG(ENABLE_EXTENSIONS)
1510 // Hosted Apps should not be allowed to run if there is a problem with their
1511 // certificate. So, when users click proceed on an interstitial, move the tab
1512--- a/chrome/browser/subresource_filter/chrome_content_subresource_filter_web_contents_helper_factory.cc
1513+++ b/chrome/browser/subresource_filter/chrome_content_subresource_filter_web_contents_helper_factory.cc
1465@@ -6,7 +6,6 @@ 1514@@ -6,7 +6,6 @@
1466 1515
1467 #include "chrome/browser/browser_process.h" 1516 #include "chrome/browser/browser_process.h"
@@ -1482,9 +1531,9 @@
1482 } 1531 }
1483 1532
1484 } // namespace 1533 } // namespace
1485--- chrome/browser/ui/BUILD.gn.orig 1534--- a/chrome/browser/ui/BUILD.gn
1486+++ chrome/browser/ui/BUILD.gn 1535+++ b/chrome/browser/ui/BUILD.gn
1487@@ -533,7 +533,6 @@ static_library("ui") { 1536@@ -546,7 +546,6 @@ static_library("ui") {
1488 "//components/renderer_context_menu", 1537 "//components/renderer_context_menu",
1489 "//components/resources", 1538 "//components/resources",
1490 "//components/safe_browsing/content/browser", 1539 "//components/safe_browsing/content/browser",
@@ -1492,8 +1541,17 @@
1492 "//components/safe_browsing/content/browser/password_protection", 1541 "//components/safe_browsing/content/browser/password_protection",
1493 "//components/safe_browsing/content/browser/web_ui", 1542 "//components/safe_browsing/content/browser/web_ui",
1494 "//components/safe_browsing/core/browser/db:database_manager", 1543 "//components/safe_browsing/core/browser/db:database_manager",
1495--- chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.cc.orig 1544@@ -4667,8 +4666,6 @@ static_library("ui") {
1496+++ chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.cc 1545 "views/safe_browsing/password_reuse_modal_warning_dialog.h",
1546 "views/safe_browsing/prompt_for_scanning_modal_dialog.cc",
1547 "views/safe_browsing/prompt_for_scanning_modal_dialog.h",
1548- "views/safe_browsing/tailored_security_unconsented_modal.cc",
1549- "views/safe_browsing/tailored_security_unconsented_modal.h",
1550 "views/send_tab_to_self/send_tab_to_self_bubble_device_button.cc",
1551 "views/send_tab_to_self/send_tab_to_self_bubble_device_button.h",
1552 "views/send_tab_to_self/send_tab_to_self_bubble_view_impl.cc",
1553--- a/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.cc
1554+++ b/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.cc
1497@@ -16,6 +16,7 @@ 1555@@ -16,6 +16,7 @@
1498 #include "components/javascript_dialogs/tab_modal_dialog_manager.h" 1556 #include "components/javascript_dialogs/tab_modal_dialog_manager.h"
1499 #include "components/javascript_dialogs/tab_modal_dialog_view.h" 1557 #include "components/javascript_dialogs/tab_modal_dialog_view.h"
@@ -1518,12 +1576,12 @@
1518 } 1576 }
1519 1577
1520 void JavaScriptTabModalDialogManagerDelegateDesktop::DidCloseDialog() { 1578 void JavaScriptTabModalDialogManagerDelegateDesktop::DidCloseDialog() {
1521--- chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc.orig 1579--- a/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc
1522+++ chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc 1580+++ b/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc
1523@@ -11,7 +11,10 @@ 1581@@ -10,7 +10,10 @@
1524 #include "base/task/post_task.h" 1582 #include "base/strings/utf_string_conversions.h"
1583 #include "base/task/task_runner_util.h"
1525 #include "base/task/thread_pool.h" 1584 #include "base/task/thread_pool.h"
1526 #include "base/task_runner_util.h"
1527+#include "components/safe_browsing/buildflags.h" 1585+#include "components/safe_browsing/buildflags.h"
1528+#if BUILDFLAG(FULL_SAFE_BROWSING) 1586+#if BUILDFLAG(FULL_SAFE_BROWSING)
1529 #include "chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h" 1587 #include "chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h"
@@ -1531,7 +1589,7 @@
1531 #include "chrome/browser/profiles/profile.h" 1589 #include "chrome/browser/profiles/profile.h"
1532 #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h" 1590 #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h"
1533 #include "content/public/browser/web_contents.h" 1591 #include "content/public/browser/web_contents.h"
1534@@ -22,6 +25,7 @@ 1592@@ -21,6 +24,7 @@
1535 1593
1536 namespace { 1594 namespace {
1537 1595
@@ -1539,7 +1597,7 @@
1539 void CompletionCallback( 1597 void CompletionCallback(
1540 content::WebContentsViewDelegate::DropCompletionCallback callback, 1598 content::WebContentsViewDelegate::DropCompletionCallback callback,
1541 const enterprise_connectors::ContentAnalysisDelegate::Data& data, 1599 const enterprise_connectors::ContentAnalysisDelegate::Data& data,
1542@@ -63,6 +67,7 @@ enterprise_connectors::ContentAnalysisDe 1600@@ -62,6 +66,7 @@ enterprise_connectors::ContentAnalysisDe
1543 } 1601 }
1544 return data; 1602 return data;
1545 } 1603 }
@@ -1547,7 +1605,7 @@
1547 1605
1548 // Helper class to handle WebContents being destroyed while files are opened in 1606 // Helper class to handle WebContents being destroyed while files are opened in
1549 // the threadpool. This class deletes itself either when it's no longer needed 1607 // the threadpool. This class deletes itself either when it's no longer needed
1550@@ -76,6 +81,7 @@ class HandleDropScanData : public conten 1608@@ -75,6 +80,7 @@ class HandleDropScanData : public conten
1551 : content::WebContentsObserver(web_contents), 1609 : content::WebContentsObserver(web_contents),
1552 callback_(std::move(callback)) {} 1610 callback_(std::move(callback)) {}
1553 1611
@@ -1555,7 +1613,7 @@
1555 void ScanData( 1613 void ScanData(
1556 enterprise_connectors::ContentAnalysisDelegate::Data analysis_data) { 1614 enterprise_connectors::ContentAnalysisDelegate::Data analysis_data) {
1557 DCHECK(web_contents()); 1615 DCHECK(web_contents());
1558@@ -87,6 +93,7 @@ class HandleDropScanData : public conten 1616@@ -86,6 +92,7 @@ class HandleDropScanData : public conten
1559 1617
1560 delete this; 1618 delete this;
1561 } 1619 }
@@ -1563,7 +1621,7 @@
1563 1621
1564 void WebContentsDestroyed() override { delete this; } 1622 void WebContentsDestroyed() override { delete this; }
1565 1623
1566@@ -106,13 +113,16 @@ void HandleOnPerformDrop( 1624@@ -105,13 +112,16 @@ void HandleOnPerformDrop(
1567 content::WebContents* web_contents, 1625 content::WebContents* web_contents,
1568 const content::DropData& drop_data, 1626 const content::DropData& drop_data,
1569 content::WebContentsViewDelegate::DropCompletionCallback callback) { 1627 content::WebContentsViewDelegate::DropCompletionCallback callback) {
@@ -1580,7 +1638,7 @@
1580 if (!enterprise_connectors::ContentAnalysisDelegate::IsEnabled( 1638 if (!enterprise_connectors::ContentAnalysisDelegate::IsEnabled(
1581 profile, web_contents->GetLastCommittedURL(), &data, connector)) { 1639 profile, web_contents->GetLastCommittedURL(), &data, connector)) {
1582 std::move(callback).Run( 1640 std::move(callback).Run(
1583@@ -154,4 +164,8 @@ void HandleOnPerformDrop( 1641@@ -151,4 +161,8 @@ void HandleOnPerformDrop(
1584 std::move(callback).Run( 1642 std::move(callback).Run(
1585 content::WebContentsViewDelegate::DropCompletionResult::kContinue); 1643 content::WebContentsViewDelegate::DropCompletionResult::kContinue);
1586 } 1644 }
@@ -1589,8 +1647,8 @@
1589+ content::WebContentsViewDelegate::DropCompletionResult::kContinue); 1647+ content::WebContentsViewDelegate::DropCompletionResult::kContinue);
1590+#endif // BUILDFLAG(FULL_SAFE_BROWSING) 1648+#endif // BUILDFLAG(FULL_SAFE_BROWSING)
1591 } 1649 }
1592--- chrome/browser/ui/views/download/download_item_view.cc.orig 1650--- a/chrome/browser/ui/views/download/download_item_view.cc
1593+++ chrome/browser/ui/views/download/download_item_view.cc 1651+++ b/chrome/browser/ui/views/download/download_item_view.cc
1594@@ -837,9 +837,7 @@ void DownloadItemView::UpdateLabels() { 1652@@ -837,9 +837,7 @@ void DownloadItemView::UpdateLabels() {
1595 deep_scanning_label_->SetVisible(mode_ == 1653 deep_scanning_label_->SetVisible(mode_ ==
1596 download::DownloadItemMode::kDeepScanning); 1654 download::DownloadItemMode::kDeepScanning);
@@ -1618,7 +1676,7 @@
1618 open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) || 1676 open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) ||
1619 prompt_to_scan || allow_open_during_deep_scan); 1677 prompt_to_scan || allow_open_during_deep_scan);
1620 1678
1621@@ -1427,7 +1429,9 @@ void DownloadItemView::ShowContextMenuIm 1679@@ -1421,7 +1423,9 @@ void DownloadItemView::ShowContextMenuIm
1622 } 1680 }
1623 1681
1624 void DownloadItemView::OpenDownloadDuringAsyncScanning() { 1682 void DownloadItemView::OpenDownloadDuringAsyncScanning() {
@@ -1628,9 +1686,9 @@
1628 model_->SetOpenWhenComplete(true); 1686 model_->SetOpenWhenComplete(true);
1629 } 1687 }
1630 1688
1631--- chrome/browser/ui/webui/downloads/downloads_dom_handler.cc.orig 1689--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
1632+++ chrome/browser/ui/webui/downloads/downloads_dom_handler.cc 1690+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
1633@@ -366,7 +366,6 @@ void DownloadsDOMHandler::OpenDuringScan 1691@@ -367,7 +367,6 @@ void DownloadsDOMHandler::OpenDuringScan
1634 if (download) { 1692 if (download) {
1635 DownloadItemModel model(download); 1693 DownloadItemModel model(download);
1636 model.SetOpenWhenComplete(true); 1694 model.SetOpenWhenComplete(true);
@@ -1638,9 +1696,9 @@
1638 } 1696 }
1639 } 1697 }
1640 1698
1641--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 1699--- a/chrome/browser/ui/webui/management/management_ui_handler.cc
1642+++ chrome/browser/ui/webui/management/management_ui_handler.cc 1700+++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
1643@@ -805,12 +805,6 @@ base::Value ManagementUIHandler::GetThre 1701@@ -843,12 +843,6 @@ base::Value ManagementUIHandler::GetThre
1644 &info); 1702 &info);
1645 } 1703 }
1646 1704
@@ -1653,9 +1711,9 @@
1653 const std::string enterprise_manager = 1711 const std::string enterprise_manager =
1654 connectors_service->GetManagementDomain(); 1712 connectors_service->GetManagementDomain();
1655 1713
1656--- chrome/browser/webshare/share_service_impl.cc.orig 1714--- a/chrome/browser/webshare/share_service_impl.cc
1657+++ chrome/browser/webshare/share_service_impl.cc 1715+++ b/chrome/browser/webshare/share_service_impl.cc
1658@@ -14,7 +14,9 @@ 1716@@ -17,7 +17,9 @@
1659 #include "chrome/browser/browser_process.h" 1717 #include "chrome/browser/browser_process.h"
1660 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 1718 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
1661 #include "chrome/common/chrome_features.h" 1719 #include "chrome/common/chrome_features.h"
@@ -1665,10 +1723,10 @@
1665 #include "components/safe_browsing/core/browser/db/database_manager.h" 1723 #include "components/safe_browsing/core/browser/db/database_manager.h"
1666 #include "content/public/browser/web_contents.h" 1724 #include "content/public/browser/web_contents.h"
1667 #include "mojo/public/cpp/bindings/self_owned_receiver.h" 1725 #include "mojo/public/cpp/bindings/self_owned_receiver.h"
1668@@ -182,11 +184,13 @@ void ShareServiceImpl::Share(const std:: 1726@@ -198,11 +200,13 @@ void ShareServiceImpl::Share(const std::
1727
1669 // Check if at least one file is marked by the download protection service 1728 // Check if at least one file is marked by the download protection service
1670 // to send a ping to check this file type. 1729 // to send a ping to check this file type.
1671 const base::FilePath path = base::FilePath::FromUTF8Unsafe(file->name);
1672+#if BUILDFLAG(SAFE_BROWSING_AVAILABLE) 1730+#if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
1673 if (!should_check_url && 1731 if (!should_check_url &&
1674 safe_browsing::FileTypePolicies::GetInstance()->IsCheckedBinaryFile( 1732 safe_browsing::FileTypePolicies::GetInstance()->IsCheckedBinaryFile(
@@ -1679,7 +1737,7 @@
1679 1737
1680 // In the case where the original blob handle was to a native file (of 1738 // In the case where the original blob handle was to a native file (of
1681 // unknown size), the serialized data does not contain an accurate file 1739 // unknown size), the serialized data does not contain an accurate file
1682@@ -196,6 +200,7 @@ void ShareServiceImpl::Share(const std:: 1740@@ -212,6 +216,7 @@ void ShareServiceImpl::Share(const std::
1683 } 1741 }
1684 1742
1685 DCHECK(!safe_browsing_request_); 1743 DCHECK(!safe_browsing_request_);
@@ -1687,7 +1745,7 @@
1687 if (should_check_url && g_browser_process->safe_browsing_service()) { 1745 if (should_check_url && g_browser_process->safe_browsing_service()) {
1688 safe_browsing_request_.emplace( 1746 safe_browsing_request_.emplace(
1689 g_browser_process->safe_browsing_service()->database_manager(), 1747 g_browser_process->safe_browsing_service()->database_manager(),
1690@@ -205,6 +210,7 @@ void ShareServiceImpl::Share(const std:: 1748@@ -221,6 +226,7 @@ void ShareServiceImpl::Share(const std::
1691 std::move(files), std::move(callback))); 1749 std::move(files), std::move(callback)));
1692 return; 1750 return;
1693 } 1751 }
@@ -1695,9 +1753,9 @@
1695 1753
1696 OnSafeBrowsingResultReceived(title, text, share_url, std::move(files), 1754 OnSafeBrowsingResultReceived(title, text, share_url, std::move(files),
1697 std::move(callback), 1755 std::move(callback),
1698--- chrome/test/BUILD.gn.orig 1756--- a/chrome/test/BUILD.gn
1699+++ chrome/test/BUILD.gn 1757+++ b/chrome/test/BUILD.gn
1700@@ -1196,7 +1196,6 @@ if (!is_android && !is_fuchsia) { 1758@@ -1314,7 +1314,6 @@ if (!is_android) {
1701 "//components/resources", 1759 "//components/resources",
1702 "//components/safe_browsing:buildflags", 1760 "//components/safe_browsing:buildflags",
1703 "//components/safe_browsing/content/browser", 1761 "//components/safe_browsing/content/browser",
@@ -1705,7 +1763,7 @@
1705 "//components/safe_browsing/content/browser:safe_browsing_service", 1763 "//components/safe_browsing/content/browser:safe_browsing_service",
1706 "//components/safe_browsing/content/browser/password_protection", 1764 "//components/safe_browsing/content/browser/password_protection",
1707 "//components/safe_browsing/content/browser/password_protection:test_support", 1765 "//components/safe_browsing/content/browser/password_protection:test_support",
1708@@ -5349,7 +5348,6 @@ test("unit_tests") { 1766@@ -5819,7 +5818,6 @@ test("unit_tests") {
1709 "//components/resources", 1767 "//components/resources",
1710 "//components/safe_browsing:buildflags", 1768 "//components/safe_browsing:buildflags",
1711 "//components/safe_browsing/content/browser", 1769 "//components/safe_browsing/content/browser",
@@ -1713,20 +1771,20 @@
1713 "//components/safe_browsing/content/browser/password_protection", 1771 "//components/safe_browsing/content/browser/password_protection",
1714 "//components/safe_browsing/content/browser/password_protection:mock_password_protection", 1772 "//components/safe_browsing/content/browser/password_protection:mock_password_protection",
1715 "//components/safe_browsing/content/browser/web_ui", 1773 "//components/safe_browsing/content/browser/web_ui",
1716--- components/password_manager/content/browser/content_password_manager_driver.cc.orig 1774--- a/components/password_manager/content/browser/content_password_manager_driver.cc
1717+++ components/password_manager/content/browser/content_password_manager_driver.cc 1775+++ b/components/password_manager/content/browser/content_password_manager_driver.cc
1718@@ -407,7 +407,7 @@ void ContentPasswordManagerDriver::Check 1776@@ -415,7 +415,7 @@ void ContentPasswordManagerDriver::Check
1719 if (client_->GetMetricsRecorder()) { 1777 if (!password_manager::bad_message::CheckFrameNotPrerendering(
1720 client_->GetMetricsRecorder()->RecordUserFocusedPasswordField(); 1778 render_frame_host_))
1721 } 1779 return;
1722-#if defined(ON_FOCUS_PING_ENABLED) 1780-#if defined(ON_FOCUS_PING_ENABLED)
1723+#if defined(ON_FOCUS_PING_ENABLED) && BUILDFLAG(FULL_SAFE_BROWSING) 1781+#if defined(ON_FOCUS_PING_ENABLED) && BUILDFLAG(FULL_SAFE_BROWSING)
1724 client_->CheckSafeBrowsingReputation(form_action, frame_url); 1782 client_->CheckSafeBrowsingReputation(form_action, frame_url);
1725 #endif 1783 #endif
1726 } 1784 }
1727--- components/password_manager/core/browser/password_manager_client.h.orig 1785--- a/components/password_manager/core/browser/password_manager_client.h
1728+++ components/password_manager/core/browser/password_manager_client.h 1786+++ b/components/password_manager/core/browser/password_manager_client.h
1729@@ -339,11 +339,14 @@ class PasswordManagerClient { 1787@@ -374,11 +374,14 @@ class PasswordManagerClient {
1730 // Returns the current best guess as to the page's display language. 1788 // Returns the current best guess as to the page's display language.
1731 virtual autofill::LanguageCode GetPageLanguage() const; 1789 virtual autofill::LanguageCode GetPageLanguage() const;
1732 1790
@@ -1742,7 +1800,7 @@
1742 // Checks the safe browsing reputation of the webpage when the 1800 // Checks the safe browsing reputation of the webpage when the
1743 // user focuses on a username/password field. This is used for reporting 1801 // user focuses on a username/password field. This is used for reporting
1744 // only, and won't trigger a warning. 1802 // only, and won't trigger a warning.
1745@@ -351,6 +354,7 @@ class PasswordManagerClient { 1803@@ -386,6 +389,7 @@ class PasswordManagerClient {
1746 const GURL& frame_url) = 0; 1804 const GURL& frame_url) = 0;
1747 #endif 1805 #endif
1748 1806
@@ -1750,7 +1808,7 @@
1750 // Checks the safe browsing reputation of the webpage where password reuse 1808 // Checks the safe browsing reputation of the webpage where password reuse
1751 // happens. This is called by the PasswordReuseDetectionManager when a 1809 // happens. This is called by the PasswordReuseDetectionManager when a
1752 // protected password is typed on the wrong domain. This may trigger a 1810 // protected password is typed on the wrong domain. This may trigger a
1753@@ -363,6 +367,7 @@ class PasswordManagerClient { 1811@@ -398,6 +402,7 @@ class PasswordManagerClient {
1754 const std::string& username, 1812 const std::string& username,
1755 const std::vector<MatchingReusedCredential>& matching_reused_credentials, 1813 const std::vector<MatchingReusedCredential>& matching_reused_credentials,
1756 bool password_field_exists) = 0; 1814 bool password_field_exists) = 0;
@@ -1758,8 +1816,8 @@
1758 1816
1759 // Records a Chrome Sync event that GAIA password reuse was detected. 1817 // Records a Chrome Sync event that GAIA password reuse was detected.
1760 virtual void LogPasswordReuseDetectedEvent() = 0; 1818 virtual void LogPasswordReuseDetectedEvent() = 0;
1761--- components/password_manager/core/browser/password_reuse_detection_manager.cc.orig 1819--- a/components/password_manager/core/browser/password_reuse_detection_manager.cc
1762+++ components/password_manager/core/browser/password_reuse_detection_manager.cc 1820+++ b/components/password_manager/core/browser/password_reuse_detection_manager.cc
1763@@ -161,9 +161,11 @@ void PasswordReuseDetectionManager::OnRe 1821@@ -161,9 +161,11 @@ void PasswordReuseDetectionManager::OnRe
1764 ? reused_protected_password_hash->username 1822 ? reused_protected_password_hash->username
1765 : ""; 1823 : "";
@@ -1772,19 +1830,8 @@
1772 } 1830 }
1773 1831
1774 void PasswordReuseDetectionManager::SetClockForTesting(base::Clock* clock) { 1832 void PasswordReuseDetectionManager::SetClockForTesting(base::Clock* clock) {
1775--- components/safe_browsing/content/browser/BUILD.gn.orig 1833--- a/components/safe_browsing/content/common/proto/BUILD.gn
1776+++ components/safe_browsing/content/browser/BUILD.gn 1834+++ b/components/safe_browsing/content/common/proto/BUILD.gn
1777@@ -82,8 +82,6 @@ source_set("browser") {
1778 "threat_details_cache.h",
1779 "threat_details_history.cc",
1780 "threat_details_history.h",
1781- "user_population.cc",
1782- "user_population.h",
1783 "web_api_handshake_checker.cc",
1784 "web_api_handshake_checker.h",
1785 ]
1786--- components/safe_browsing/content/common/proto/BUILD.gn.orig
1787+++ components/safe_browsing/content/common/proto/BUILD.gn
1788@@ -5,8 +5,12 @@ 1835@@ -5,8 +5,12 @@
1789 import("//components/safe_browsing/buildflags.gni") 1836 import("//components/safe_browsing/buildflags.gni")
1790 import("//third_party/protobuf/proto_library.gni") 1837 import("//third_party/protobuf/proto_library.gni")
@@ -1800,8 +1847,8 @@
1800 } 1847 }
1801-} 1848-}
1802+# } 1849+# }
1803--- components/safe_browsing/content/common/safe_browsing.mojom.orig 1850--- a/components/safe_browsing/content/common/safe_browsing.mojom
1804+++ components/safe_browsing/content/common/safe_browsing.mojom 1851+++ b/components/safe_browsing/content/common/safe_browsing.mojom
1805@@ -120,7 +120,6 @@ enum PhishingDetectorResult { 1852@@ -120,7 +120,6 @@ enum PhishingDetectorResult {
1806 INVALID_SCORE = 4, 1853 INVALID_SCORE = 4,
1807 }; 1854 };
@@ -1810,9 +1857,39 @@
1810 // Interface for setting the CSD model and to start phishing classification. 1857 // Interface for setting the CSD model and to start phishing classification.
1811 interface PhishingDetector { 1858 interface PhishingDetector {
1812 // A classification model for client-side phishing detection. 1859 // A classification model for client-side phishing detection.
1813--- content/browser/file_system_access/safe_move_helper.cc.orig 1860--- a/components/safe_browsing/core/browser/BUILD.gn
1814+++ content/browser/file_system_access/safe_move_helper.cc 1861+++ b/components/safe_browsing/core/browser/BUILD.gn
1815@@ -150,14 +150,8 @@ void SafeMoveHelper::Start(SafeMoveHelpe 1862@@ -11,8 +11,6 @@ source_set("browser") {
1863 "safe_browsing_url_checker_impl.cc",
1864 "safe_browsing_url_checker_impl.h",
1865 "url_checker_delegate.h",
1866- "user_population.cc",
1867- "user_population.h",
1868 ]
1869
1870 public_deps = [ "//google_apis:google_apis" ]
1871--- a/components/safe_browsing/core/browser/verdict_cache_manager.cc
1872+++ b/components/safe_browsing/core/browser/verdict_cache_manager.cc
1873@@ -402,16 +402,6 @@ VerdictCacheManager::VerdictCacheManager
1874 // pref_service can be null in tests.
1875 if (pref_service) {
1876 pref_change_registrar_.Init(pref_service);
1877- pref_change_registrar_.Add(
1878- prefs::kSafeBrowsingEnhanced,
1879- base::BindRepeating(&VerdictCacheManager::CleanUpAllPageLoadTokens,
1880- weak_factory_.GetWeakPtr(),
1881- ClearReason::kSafeBrowsingStateChanged));
1882- pref_change_registrar_.Add(
1883- prefs::kSafeBrowsingEnabled,
1884- base::BindRepeating(&VerdictCacheManager::CleanUpAllPageLoadTokens,
1885- weak_factory_.GetWeakPtr(),
1886- ClearReason::kSafeBrowsingStateChanged));
1887 }
1888 // sync_observer_ can be null in some embedders that don't support sync.
1889 if (sync_observer_) {
1890--- a/content/browser/file_system_access/safe_move_helper.cc
1891+++ b/content/browser/file_system_access/safe_move_helper.cc
1892@@ -154,14 +154,8 @@ void SafeMoveHelper::Start(SafeMoveHelpe
1816 return; 1893 return;
1817 } 1894 }
1818 1895
@@ -1827,7 +1904,7 @@
1827 } 1904 }
1828 1905
1829 void SafeMoveHelper::ComputeHashForSourceFile(HashCallback callback) { 1906 void SafeMoveHelper::ComputeHashForSourceFile(HashCallback callback) {
1830@@ -177,38 +171,6 @@ void SafeMoveHelper::ComputeHashForSourc 1907@@ -181,44 +175,6 @@ void SafeMoveHelper::ComputeHashForSourc
1831 std::move(wrapped_callback), source_url())); 1908 std::move(wrapped_callback), source_url()));
1832 } 1909 }
1833 1910
@@ -1850,12 +1927,18 @@
1850- return; 1927- return;
1851- } 1928- }
1852- 1929-
1930- content::GlobalRenderFrameHostId outermost_main_frame_id;
1931- auto* rfh = content::RenderFrameHost::FromID(context_.frame_id);
1932- if (rfh)
1933- outermost_main_frame_id = rfh->GetOutermostMainFrame()->GetGlobalId();
1934-
1853- auto item = std::make_unique<FileSystemAccessWriteItem>(); 1935- auto item = std::make_unique<FileSystemAccessWriteItem>();
1854- item->target_file_path = dest_url().path(); 1936- item->target_file_path = dest_url().path();
1855- item->full_path = source_url().path(); 1937- item->full_path = source_url().path();
1856- item->sha256_hash = hash; 1938- item->sha256_hash = hash;
1857- item->size = size; 1939- item->size = size;
1858- item->frame_url = context_.url; 1940- item->frame_url = context_.url;
1941- item->outermost_main_frame_id = outermost_main_frame_id;
1859- item->has_user_gesture = has_transient_user_activation_; 1942- item->has_user_gesture = has_transient_user_activation_;
1860- manager_->permission_context()->PerformAfterWriteChecks( 1943- manager_->permission_context()->PerformAfterWriteChecks(
1861- std::move(item), context_.frame_id, 1944- std::move(item), context_.frame_id,
@@ -1866,8 +1949,8 @@
1866 void SafeMoveHelper::DidAfterWriteCheck( 1949 void SafeMoveHelper::DidAfterWriteCheck(
1867 FileSystemAccessPermissionContext::AfterWriteCheckResult result) { 1950 FileSystemAccessPermissionContext::AfterWriteCheckResult result) {
1868 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); 1951 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
1869--- content/browser/file_system_access/safe_move_helper.h.orig 1952--- a/content/browser/file_system_access/safe_move_helper.h
1870+++ content/browser/file_system_access/safe_move_helper.h 1953+++ b/content/browser/file_system_access/safe_move_helper.h
1871@@ -52,9 +52,6 @@ class CONTENT_EXPORT SafeMoveHelper { 1954@@ -52,9 +52,6 @@ class CONTENT_EXPORT SafeMoveHelper {
1872 private: 1955 private:
1873 SEQUENCE_CHECKER(sequence_checker_); 1956 SEQUENCE_CHECKER(sequence_checker_);
@@ -1878,8 +1961,8 @@
1878 void DidAfterWriteCheck( 1961 void DidAfterWriteCheck(
1879 FileSystemAccessPermissionContext::AfterWriteCheckResult result); 1962 FileSystemAccessPermissionContext::AfterWriteCheckResult result);
1880 void DidFileSkipQuarantine(base::File::Error result); 1963 void DidFileSkipQuarantine(base::File::Error result);
1881--- content/public/browser/file_system_access_permission_context.h.orig 1964--- a/content/public/browser/file_system_access_permission_context.h
1882+++ content/public/browser/file_system_access_permission_context.h 1965+++ b/content/public/browser/file_system_access_permission_context.h
1883@@ -107,12 +107,6 @@ class FileSystemAccessPermissionContext 1966@@ -107,12 +107,6 @@ class FileSystemAccessPermissionContext
1884 base::OnceCallback<void(SensitiveDirectoryResult)> callback) = 0; 1967 base::OnceCallback<void(SensitiveDirectoryResult)> callback) = 0;
1885 1968
@@ -1893,9 +1976,9 @@
1893 1976
1894 // Returns whether the give |origin| already allows read permission, or it is 1977 // Returns whether the give |origin| already allows read permission, or it is
1895 // possible to request one. This is used to block file dialogs from being 1978 // possible to request one. This is used to block file dialogs from being
1896--- extensions/browser/updater/update_service.cc.orig 1979--- a/extensions/browser/updater/update_service.cc
1897+++ extensions/browser/updater/update_service.cc 1980+++ b/extensions/browser/updater/update_service.cc
1898@@ -111,13 +111,6 @@ void UpdateService::OnEvent(Events event 1981@@ -122,13 +122,6 @@ void UpdateService::OnEvent(Events event
1899 break; 1982 break;
1900 } 1983 }
1901 1984
@@ -1909,9 +1992,20 @@
1909 } 1992 }
1910 1993
1911 UpdateService::UpdateService( 1994 UpdateService::UpdateService(
1912--- weblayer/BUILD.gn.orig 1995--- a/printing/buildflags/buildflags.gni
1913+++ weblayer/BUILD.gn 1996+++ b/printing/buildflags/buildflags.gni
1914@@ -463,7 +463,6 @@ source_set("weblayer_lib_base") { 1997@@ -37,7 +37,7 @@ declare_args() {
1998 # Enable snapshotting a page when printing for its content to be analyzed for
1999 # sensitive content by enterprise users.
2000 enable_print_content_analysis =
2001- is_chromeos_ash || is_chromeos_lacros || is_win || is_linux || is_mac
2002+ false
2003 }
2004
2005 declare_args() {
2006--- a/weblayer/BUILD.gn
2007+++ b/weblayer/BUILD.gn
2008@@ -462,7 +462,6 @@ source_set("weblayer_lib_base") {
1915 "//components/prefs", 2009 "//components/prefs",
1916 "//components/profile_metrics", 2010 "//components/profile_metrics",
1917 "//components/safe_browsing/content/browser", 2011 "//components/safe_browsing/content/browser",
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch b/www/chromium-uc/patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch
index 74d5b79..623320f 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch
@@ -1,7 +1,7 @@
1# Split up the learn.doubleclick.net string literal to prevent domain substitution breaking compilation due to the use of the excluded HSTS list json file in this code. 1# Split up the learn.doubleclick.net string literal to prevent domain substitution breaking compilation due to the use of the excluded HSTS list json file in this code.
2 2
3--- net/tools/transport_security_state_generator/transport_security_state_generator.cc.orig 3--- a/net/tools/transport_security_state_generator/transport_security_state_generator.cc
4+++ net/tools/transport_security_state_generator/transport_security_state_generator.cc 4+++ b/net/tools/transport_security_state_generator/transport_security_state_generator.cc
5@@ -125,7 +125,7 @@ bool CheckDuplicateEntries(const Transpo 5@@ -125,7 +125,7 @@ bool CheckDuplicateEntries(const Transpo
6 bool CheckNoopEntries(const TransportSecurityStateEntries& entries) { 6 bool CheckNoopEntries(const TransportSecurityStateEntries& entries) {
7 for (const auto& entry : entries) { 7 for (const auto& entry : entries) {
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch b/www/chromium-uc/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
index 0527dde..d6d7e41 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
@@ -2,17 +2,17 @@
2# TODO: This patch should probably be split up and merged into 2# TODO: This patch should probably be split up and merged into
3# disable-signin.patch and fix-building-without-safebrowsing.patch 3# disable-signin.patch and fix-building-without-safebrowsing.patch
4 4
5--- android_webview/browser/aw_browser_context.cc.orig 5--- a/android_webview/browser/aw_browser_context.cc
6+++ android_webview/browser/aw_browser_context.cc 6+++ b/android_webview/browser/aw_browser_context.cc
7@@ -49,7 +49,6 @@ 7@@ -48,7 +48,6 @@
8 #include "components/prefs/pref_service_factory.h" 8 #include "components/prefs/pref_service_factory.h"
9 #include "components/prefs/segregated_pref_store.h" 9 #include "components/prefs/segregated_pref_store.h"
10 #include "components/profile_metrics/browser_profile_type.h" 10 #include "components/profile_metrics/browser_profile_type.h"
11-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 11-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
12 #include "components/url_formatter/url_fixer.h" 12 #include "components/url_formatter/url_fixer.h"
13 #include "components/user_prefs/user_prefs.h" 13 #include "components/user_prefs/user_prefs.h"
14 #include "components/visitedlink/browser/visitedlink_writer.h" 14 #include "components/variations/variations_client.h"
15@@ -470,8 +469,6 @@ void AwBrowserContext::RebuildTable( 15@@ -519,8 +518,6 @@ void AwBrowserContext::RebuildTable(
16 } 16 }
17 17
18 void AwBrowserContext::SetExtendedReportingAllowed(bool allowed) { 18 void AwBrowserContext::SetExtendedReportingAllowed(bool allowed) {
@@ -21,9 +21,9 @@
21 } 21 }
22 22
23 // TODO(amalova): Make sure NetworkContextParams is configured correctly when 23 // TODO(amalova): Make sure NetworkContextParams is configured correctly when
24--- chrome/app/settings_strings.grdp.orig 24--- a/chrome/app/settings_strings.grdp
25+++ chrome/app/settings_strings.grdp 25+++ b/chrome/app/settings_strings.grdp
26@@ -1591,78 +1591,9 @@ 26@@ -1842,69 +1842,9 @@
27 <message name="IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_DESC_COOKIES_PAGE" desc="On the cookies page, the secondary text next to the checkbox that enables prediction of network actions."> 27 <message name="IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_DESC_COOKIES_PAGE" desc="On the cookies page, the secondary text next to the checkbox that enables prediction of network actions.">
28 Preloads pages that Chrome thinks you might visit. To do this, Chrome may use cookies, if you allow cookies, and may encrypt and send pages through Google to hide your identity from sites. 28 Preloads pages that Chrome thinks you might visit. To do this, Chrome may use cookies, if you allow cookies, and may encrypt and send pages through Google to hide your identity from sites.
29 </message> 29 </message>
@@ -33,9 +33,6 @@
33- <message name="IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION_DESC" desc="Checkbox label: should Chrome protect user and user's device from dangerous sites"> 33- <message name="IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION_DESC" desc="Checkbox label: should Chrome protect user and user's device from dangerous sites">
34- Sends URLs of some pages you visit to Google, when your security is at risk 34- Sends URLs of some pages you visit to Google, when your security is at risk
35- </message> 35- </message>
36- <message name="IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING" desc="The section title of the extended safe browsing checkbox to help improve safe browsing">
37- Help improve Chrome security
38- </message>
39- <message name="IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC" desc="Description for extended safe browsing"> 36- <message name="IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC" desc="Description for extended safe browsing">
40- Sends URLs of some pages you visit, limited system information, and some page content to Google, to help discover new threats and protect everyone on the web. 37- Sends URLs of some pages you visit, limited system information, and some page content to Google, to help discover new threats and protect everyone on the web.
41- </message> 38- </message>
@@ -54,9 +51,6 @@
54- <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_ONE" desc="First bullet point under the safe browsing enhanced protection mode"> 51- <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_ONE" desc="First bullet point under the safe browsing enhanced protection mode">
55- Predicts and warns you about dangerous events before they happen 52- Predicts and warns you about dangerous events before they happen
56- </message> 53- </message>
57- <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_TWO" desc="Second bullet point under the safe browsing enhanced protection mode">
58- Keeps you safe on Chrome and may be used to improve your security in other Google apps when you are signed in
59- </message>
60- <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_THREE" desc="Third bullet point under the safe browsing enhanced protection mode"> 54- <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_THREE" desc="Third bullet point under the safe browsing enhanced protection mode">
61- Improves security for you and everyone on the web 55- Improves security for you and everyone on the web
62- </message> 56- </message>
@@ -70,7 +64,7 @@
70- Standard protection 64- Standard protection
71- </message> 65- </message>
72- <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_DESC" desc="Description for safe browsing standard protection mode"> 66- <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_DESC" desc="Description for safe browsing standard protection mode">
73- Standard protection against websites, downloads, and extensions that are known to be dangerous. 67- Standard protection against websites, downloads, and extensions that are known to be dangerous
74- </message> 68- </message>
75- <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_EXPAND_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing the detailed description of safe browsing standard protection. Only visible by screen reader software."> 69- <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_EXPAND_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing the detailed description of safe browsing standard protection. Only visible by screen reader software.">
76- Show standard protection details 70- Show standard protection details
@@ -78,9 +72,6 @@
78- <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_ONE" desc="First bullet point under the safe browsing standard protection mode"> 72- <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_ONE" desc="First bullet point under the safe browsing standard protection mode">
79- Detects and warns you about dangerous events when they happen 73- Detects and warns you about dangerous events when they happen
80- </message> 74- </message>
81- <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_TWO" desc="First bullet point under the safe browsing standard protection mode">
82- Checks URLs with a list of unsafe sites stored in Chrome. If a site tries to steal your password, or when you download a harmful file, Chrome may also send URLs, including bits of page content, to Safe Browsing.
83- </message>
84- <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_HELP_IMPROVE" desc="The name of the toggle to enable reporting to help improve safe browsing"> 75- <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_HELP_IMPROVE" desc="The name of the toggle to enable reporting to help improve safe browsing">
85- Help improve security on the web for everyone 76- Help improve security on the web for everyone
86- </message> 77- </message>
@@ -102,9 +93,9 @@
102 <message name="IDS_SETTINGS_ENABLE_DO_NOT_TRACK" desc="The label of the checkbox to enable/disable sending the 'Do Not track' header"> 93 <message name="IDS_SETTINGS_ENABLE_DO_NOT_TRACK" desc="The label of the checkbox to enable/disable sending the 'Do Not track' header">
103 Send a "Do Not Track" request with your browsing traffic 94 Send a "Do Not Track" request with your browsing traffic
104 </message> 95 </message>
105--- chrome/browser/android/signin/signin_manager_android.cc.orig 96--- a/chrome/browser/android/signin/signin_manager_android.cc
106+++ chrome/browser/android/signin/signin_manager_android.cc 97+++ b/chrome/browser/android/signin/signin_manager_android.cc
107@@ -14,7 +14,6 @@ 98@@ -15,7 +15,6 @@
108 #include "chrome/android/chrome_jni_headers/SigninManagerImpl_jni.h" 99 #include "chrome/android/chrome_jni_headers/SigninManagerImpl_jni.h"
109 #include "chrome/common/pref_names.h" 100 #include "chrome/common/pref_names.h"
110 #include "components/prefs/pref_service.h" 101 #include "components/prefs/pref_service.h"
@@ -112,7 +103,7 @@
112 #include "google_apis/gaia/gaia_auth_util.h" 103 #include "google_apis/gaia/gaia_auth_util.h"
113 104
114 #include "base/android/callback_android.h" 105 #include "base/android/callback_android.h"
115@@ -30,7 +29,6 @@ 106@@ -31,7 +30,6 @@
116 #include "components/policy/core/browser/browser_policy_connector.h" 107 #include "components/policy/core/browser/browser_policy_connector.h"
117 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" 108 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
118 #include "components/prefs/pref_service.h" 109 #include "components/prefs/pref_service.h"
@@ -120,7 +111,7 @@
120 #include "components/signin/public/identity_manager/accounts_cookie_mutator.h" 111 #include "components/signin/public/identity_manager/accounts_cookie_mutator.h"
121 #include "components/signin/public/identity_manager/identity_manager.h" 112 #include "components/signin/public/identity_manager/identity_manager.h"
122 #include "content/public/browser/browser_context.h" 113 #include "content/public/browser/browser_context.h"
123@@ -95,8 +93,6 @@ class ProfileDataRemover : public conten 114@@ -96,8 +94,6 @@ class ProfileDataRemover : public conten
124 // All the Profile data has been wiped. Clear the last signed in username 115 // All the Profile data has been wiped. Clear the last signed in username
125 // as well, so that the next signin doesn't trigger the account 116 // as well, so that the next signin doesn't trigger the account
126 // change dialog. 117 // change dialog.
@@ -129,7 +120,7 @@
129 } 120 }
130 121
131 origin_runner_->PostTask(FROM_HERE, std::move(callback_)); 122 origin_runner_->PostTask(FROM_HERE, std::move(callback_));
132@@ -132,11 +128,6 @@ SigninManagerAndroid::SigninManagerAndro 123@@ -133,11 +129,6 @@ SigninManagerAndroid::SigninManagerAndro
133 DCHECK(user_cloud_policy_manager_); 124 DCHECK(user_cloud_policy_manager_);
134 DCHECK(user_policy_signin_service_); 125 DCHECK(user_policy_signin_service_);
135 126
@@ -141,7 +132,7 @@
141 force_browser_signin_.Init(prefs::kForceBrowserSignin, 132 force_browser_signin_.Init(prefs::kForceBrowserSignin,
142 g_browser_process->local_state()); 133 g_browser_process->local_state());
143 134
144@@ -160,7 +151,7 @@ void SigninManagerAndroid::Shutdown() { 135@@ -161,7 +152,7 @@ void SigninManagerAndroid::Shutdown() {
145 } 136 }
146 137
147 bool SigninManagerAndroid::IsSigninAllowed() const { 138 bool SigninManagerAndroid::IsSigninAllowed() const {
@@ -150,11 +141,11 @@
150 } 141 }
151 142
152 jboolean SigninManagerAndroid::IsSigninAllowedByPolicy(JNIEnv* env) const { 143 jboolean SigninManagerAndroid::IsSigninAllowedByPolicy(JNIEnv* env) const {
153--- chrome/browser/android/signin/signin_manager_android.h.orig 144--- a/chrome/browser/android/signin/signin_manager_android.h
154+++ chrome/browser/android/signin/signin_manager_android.h 145+++ b/chrome/browser/android/signin/signin_manager_android.h
155@@ -117,9 +117,6 @@ class SigninManagerAndroid : public Keye 146@@ -117,9 +117,6 @@ class SigninManagerAndroid : public Keye
156 147
157 Profile* const profile_ = nullptr; 148 const raw_ptr<Profile> profile_ = nullptr;
158 149
159- // Handler for prefs::kSigninAllowed set in user's profile. 150- // Handler for prefs::kSigninAllowed set in user's profile.
160- BooleanPrefMember signin_allowed_; 151- BooleanPrefMember signin_allowed_;
@@ -162,8 +153,8 @@
162 // Handler for prefs::kForceBrowserSignin. This preference is set in Local 153 // Handler for prefs::kForceBrowserSignin. This preference is set in Local
163 // State, not in user prefs. 154 // State, not in user prefs.
164 BooleanPrefMember force_browser_signin_; 155 BooleanPrefMember force_browser_signin_;
165--- chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc.orig 156--- a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc
166+++ chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc 157+++ b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc
167@@ -18,7 +18,6 @@ 158@@ -18,7 +18,6 @@
168 #include "chrome/browser/profiles/profile_manager.h" 159 #include "chrome/browser/profiles/profile_manager.h"
169 #include "chrome/common/pref_names.h" 160 #include "chrome/common/pref_names.h"
@@ -181,19 +172,19 @@
181 return; 172 return;
182 } 173 }
183 174
184--- chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc.orig 175--- a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc
185+++ chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc 176+++ b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc
186@@ -37,7 +37,6 @@ 177@@ -37,7 +37,6 @@
187 #include "components/arc/session/arc_session.h" 178 #include "chromeos/dbus/dbus_thread_manager.h"
188 #include "components/crx_file/id_util.h" 179 #include "components/crx_file/id_util.h"
189 #include "components/prefs/pref_service.h" 180 #include "components/prefs/pref_service.h"
190-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 181-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
191 #include "content/public/test/browser_task_environment.h" 182 #include "content/public/test/browser_task_environment.h"
192 #include "extensions/common/extension.h" 183 #include "extensions/common/extension.h"
193 #include "extensions/common/extension_builder.h" 184 #include "extensions/common/extension_builder.h"
194--- chrome/browser/ash/login/signin/device_id_browsertest.cc.orig 185--- a/chrome/browser/ash/login/signin/device_id_browsertest.cc
195+++ chrome/browser/ash/login/signin/device_id_browsertest.cc 186+++ b/chrome/browser/ash/login/signin/device_id_browsertest.cc
196@@ -24,7 +24,6 @@ 187@@ -25,7 +25,6 @@
197 #include "chrome/common/chrome_switches.h" 188 #include "chrome/common/chrome_switches.h"
198 #include "chrome/test/base/in_process_browser_test.h" 189 #include "chrome/test/base/in_process_browser_test.h"
199 #include "components/prefs/pref_service.h" 190 #include "components/prefs/pref_service.h"
@@ -201,7 +192,7 @@
201 #include "components/user_manager/known_user.h" 192 #include "components/user_manager/known_user.h"
202 #include "components/user_manager/user_manager.h" 193 #include "components/user_manager/user_manager.h"
203 #include "content/public/test/browser_test.h" 194 #include "content/public/test/browser_test.h"
204@@ -249,15 +248,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE 195@@ -256,15 +255,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE
205 SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword, 196 SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword,
206 kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId); 197 kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId);
207 198
@@ -216,8 +207,8 @@
216- 207-
217 // Can't use SetKnownUserDeviceId here, because it forbids changing a device 208 // Can't use SetKnownUserDeviceId here, because it forbids changing a device
218 // ID. 209 // ID.
219 user_manager::known_user::SetStringPref( 210 user_manager::KnownUser known_user(g_browser_process->local_state());
220@@ -282,13 +272,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE 211@@ -290,13 +280,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE
221 SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword, 212 SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword,
222 kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId); 213 kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId);
223 214
@@ -230,10 +221,10 @@
230- 221-
231 // Can't use SetKnownUserDeviceId here, because it forbids changing a device 222 // Can't use SetKnownUserDeviceId here, because it forbids changing a device
232 // ID. 223 // ID.
233 user_manager::known_user::SetStringPref( 224 user_manager::KnownUser known_user(g_browser_process->local_state());
234--- chrome/browser/chrome_content_browser_client.cc.orig 225--- a/chrome/browser/chrome_content_browser_client.cc
235+++ chrome/browser/chrome_content_browser_client.cc 226+++ b/chrome/browser/chrome_content_browser_client.cc
236@@ -225,7 +225,6 @@ 227@@ -236,7 +236,6 @@
237 #include "components/safe_browsing/core/browser/realtime/url_lookup_service.h" 228 #include "components/safe_browsing/core/browser/realtime/url_lookup_service.h"
238 #include "components/safe_browsing/core/browser/url_checker_delegate.h" 229 #include "components/safe_browsing/core/browser/url_checker_delegate.h"
239 #include "components/safe_browsing/core/common/features.h" 230 #include "components/safe_browsing/core/common/features.h"
@@ -241,9 +232,19 @@
241 #include "components/security_interstitials/content/insecure_form_navigation_throttle.h" 232 #include "components/security_interstitials/content/insecure_form_navigation_throttle.h"
242 #include "components/security_interstitials/content/origin_policy_ui.h" 233 #include "components/security_interstitials/content/origin_policy_ui.h"
243 #include "components/security_interstitials/content/ssl_cert_reporter.h" 234 #include "components/security_interstitials/content/ssl_cert_reporter.h"
244--- chrome/browser/download/download_browsertest.cc.orig 235--- a/chrome/browser/download/bubble/download_bubble_prefs.cc
245+++ chrome/browser/download/download_browsertest.cc 236+++ b/chrome/browser/download/bubble/download_bubble_prefs.cc
246@@ -103,7 +103,6 @@ 237@@ -11,7 +11,6 @@
238 #include "chrome/common/pref_names.h"
239 #include "components/prefs/pref_service.h"
240 #include "components/safe_browsing/core/common/features.h"
241-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
242
243 namespace download {
244
245--- a/chrome/browser/download/download_browsertest.cc
246+++ b/chrome/browser/download/download_browsertest.cc
247@@ -101,7 +101,6 @@
247 #include "components/safe_browsing/content/browser/safe_browsing_service_interface.h" 248 #include "components/safe_browsing/content/browser/safe_browsing_service_interface.h"
248 #include "components/safe_browsing/content/common/proto/download_file_types.pb.h" 249 #include "components/safe_browsing/content/common/proto/download_file_types.pb.h"
249 #include "components/safe_browsing/core/common/proto/csd.pb.h" 250 #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -251,9 +252,9 @@
251 #include "components/security_state/core/features.h" 252 #include "components/security_state/core/features.h"
252 #include "components/security_state/core/security_state.h" 253 #include "components/security_state/core/security_state.h"
253 #include "components/services/quarantine/test_support.h" 254 #include "components/services/quarantine/test_support.h"
254--- chrome/browser/download/download_item_model.cc.orig 255--- a/chrome/browser/download/download_item_model.cc
255+++ chrome/browser/download/download_item_model.cc 256+++ b/chrome/browser/download/download_item_model.cc
256@@ -783,6 +783,7 @@ void DownloadItemModel::ExecuteCommand(D 257@@ -830,6 +830,7 @@ void DownloadItemModel::ExecuteCommand(D
257 DownloadUIModel::ExecuteCommand(download_commands, command); 258 DownloadUIModel::ExecuteCommand(download_commands, command);
258 break; 259 break;
259 case DownloadCommands::DEEP_SCAN: 260 case DownloadCommands::DEEP_SCAN:
@@ -261,7 +262,7 @@
261 safe_browsing::SafeBrowsingService* sb_service = 262 safe_browsing::SafeBrowsingService* sb_service =
262 g_browser_process->safe_browsing_service(); 263 g_browser_process->safe_browsing_service();
263 if (!sb_service) 264 if (!sb_service)
264@@ -808,6 +809,7 @@ void DownloadItemModel::ExecuteCommand(D 265@@ -855,6 +856,7 @@ void DownloadItemModel::ExecuteCommand(D
265 safe_browsing::DeepScanningRequest::DeepScanTrigger:: 266 safe_browsing::DeepScanningRequest::DeepScanTrigger::
266 TRIGGER_APP_PROMPT, 267 TRIGGER_APP_PROMPT,
267 safe_browsing::DownloadCheckResult::UNKNOWN, std::move(settings)); 268 safe_browsing::DownloadCheckResult::UNKNOWN, std::move(settings));
@@ -269,8 +270,8 @@
269 break; 270 break;
270 } 271 }
271 } 272 }
272--- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc.orig 273--- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
273+++ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc 274+++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
274@@ -38,7 +38,6 @@ 275@@ -38,7 +38,6 @@
275 #include "components/policy/core/common/chrome_schema.h" 276 #include "components/policy/core/common/chrome_schema.h"
276 #include "components/prefs/pref_service.h" 277 #include "components/prefs/pref_service.h"
@@ -279,35 +280,33 @@
279 #include "components/url_matcher/url_matcher.h" 280 #include "components/url_matcher/url_matcher.h"
280 #include "content/public/browser/web_contents.h" 281 #include "content/public/browser/web_contents.h"
281 #include "crypto/secure_hash.h" 282 #include "crypto/secure_hash.h"
282--- chrome/browser/enterprise/connectors/connectors_manager.cc.orig 283--- a/chrome/browser/enterprise/connectors/connectors_manager.cc
283+++ chrome/browser/enterprise/connectors/connectors_manager.cc 284+++ b/chrome/browser/enterprise/connectors/connectors_manager.cc
284@@ -6,6 +6,7 @@ 285@@ -6,12 +6,12 @@
285 286
286 #include <memory> 287 #include <memory>
287 288
288+#include "base/bind.h" 289+#include "base/bind.h"
289 #include "base/feature_list.h" 290 #include "base/feature_list.h"
290 #include "base/no_destructor.h"
291 #include "base/values.h" 291 #include "base/values.h"
292@@ -13,7 +14,6 @@ 292 #include "chrome/browser/browser_process.h"
293 #include "chrome/browser/enterprise/connectors/connectors_prefs.h" 293 #include "chrome/browser/enterprise/connectors/connectors_prefs.h"
294 #include "components/policy/core/browser/url_util.h"
295 #include "components/prefs/pref_service.h" 294 #include "components/prefs/pref_service.h"
296-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 295-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
297 #include "components/url_matcher/url_matcher.h" 296 #include "components/url_matcher/url_matcher.h"
298 #include "url/gurl.h" 297 #include "url/gurl.h"
299 298
300--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 299--- a/chrome/browser/enterprise/connectors/connectors_service.cc
301+++ chrome/browser/enterprise/connectors/connectors_service.cc 300+++ b/chrome/browser/enterprise/connectors/connectors_service.cc
302@@ -36,7 +36,6 @@ 301@@ -38,7 +38,6 @@
303 #include "components/policy/core/common/cloud/machine_level_user_cloud_policy_store.h" 302 #include "components/policy/core/common/cloud/machine_level_user_cloud_policy_store.h"
304 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" 303 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
305 #include "components/policy/core/common/policy_types.h" 304 #include "components/policy/core/common/policy_types.h"
306-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 305-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
307 #include "components/signin/public/identity_manager/consent_level.h" 306 #include "components/signin/public/base/consent_level.h"
308 #include "components/signin/public/identity_manager/identity_manager.h" 307 #include "components/signin/public/identity_manager/identity_manager.h"
309 #include "components/user_prefs/user_prefs.h" 308 #include "components/user_prefs/user_prefs.h"
310@@ -406,8 +405,7 @@ std::string ConnectorsService::GetManage 309@@ -391,8 +390,7 @@ std::string ConnectorsService::GetManage
311 310
312 absl::optional<policy::PolicyScope> scope = absl::nullopt; 311 absl::optional<policy::PolicyScope> scope = absl::nullopt;
313 for (const char* scope_pref : 312 for (const char* scope_pref :
@@ -316,8 +315,8 @@
316+ {ConnectorScopePref(AnalysisConnector::FILE_ATTACHED), 315+ {ConnectorScopePref(AnalysisConnector::FILE_ATTACHED),
317 ConnectorScopePref(AnalysisConnector::FILE_DOWNLOADED), 316 ConnectorScopePref(AnalysisConnector::FILE_DOWNLOADED),
318 ConnectorScopePref(AnalysisConnector::BULK_DATA_ENTRY), 317 ConnectorScopePref(AnalysisConnector::BULK_DATA_ENTRY),
319 ConnectorScopePref(ReportingConnector::SECURITY_EVENT)}) { 318 ConnectorScopePref(AnalysisConnector::PRINT),
320@@ -458,20 +456,6 @@ std::string ConnectorsService::GetManage 319@@ -444,20 +442,6 @@ std::string ConnectorsService::GetManage
321 320
322 absl::optional<std::string> ConnectorsService::GetDMTokenForRealTimeUrlCheck() 321 absl::optional<std::string> ConnectorsService::GetDMTokenForRealTimeUrlCheck()
323 const { 322 const {
@@ -338,9 +337,9 @@
338 return absl::nullopt; 337 return absl::nullopt;
339 } 338 }
340 339
341--- chrome/browser/enterprise/connectors/connectors_service.h.orig 340--- a/chrome/browser/enterprise/connectors/connectors_service.h
342+++ chrome/browser/enterprise/connectors/connectors_service.h 341+++ b/chrome/browser/enterprise/connectors/connectors_service.h
343@@ -13,7 +13,6 @@ 342@@ -15,7 +15,6 @@
344 #include "components/keyed_service/content/browser_context_keyed_service_factory.h" 343 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
345 #include "components/keyed_service/core/keyed_service.h" 344 #include "components/keyed_service/core/keyed_service.h"
346 #include "components/policy/core/common/policy_types.h" 345 #include "components/policy/core/common/policy_types.h"
@@ -348,9 +347,9 @@
348 #include "content/public/browser/browser_context.h" 347 #include "content/public/browser/browser_context.h"
349 348
350 namespace base { 349 namespace base {
351--- chrome/browser/enterprise/signals/context_info_fetcher.cc.orig 350--- a/chrome/browser/enterprise/signals/context_info_fetcher.cc
352+++ chrome/browser/enterprise/signals/context_info_fetcher.cc 351+++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc
353@@ -183,11 +183,6 @@ void ContextInfoFetcher::Fetch(ContextIn 352@@ -218,11 +218,6 @@ void ContextInfoFetcher::Fetch(ContextIn
354 info.third_party_blocking_enabled = 353 info.third_party_blocking_enabled =
355 utils::GetThirdPartyBlockingEnabled(g_browser_process->local_state()); 354 utils::GetThirdPartyBlockingEnabled(g_browser_process->local_state());
356 355
@@ -360,19 +359,19 @@
360- info.password_protection_warning_trigger = 359- info.password_protection_warning_trigger =
361- utils::GetPasswordProtectionWarningTrigger(profile->GetPrefs()); 360- utils::GetPasswordProtectionWarningTrigger(profile->GetPrefs());
362 361
363 #if defined(OS_WIN) 362 #if BUILDFLAG(IS_WIN)
364 base::ThreadPool::CreateCOMSTATaskRunner({base::MayBlock()}) 363 base::ThreadPool::CreateCOMSTATaskRunner({base::MayBlock()})
365--- chrome/browser/enterprise/signals/context_info_fetcher.h.orig 364--- a/chrome/browser/enterprise/signals/context_info_fetcher.h
366+++ chrome/browser/enterprise/signals/context_info_fetcher.h 365+++ b/chrome/browser/enterprise/signals/context_info_fetcher.h
367@@ -12,7 +12,6 @@ 366@@ -13,7 +13,6 @@
368 #include "base/callback_forward.h" 367 #include "base/memory/raw_ptr.h"
369 #include "build/build_config.h" 368 #include "build/build_config.h"
370 #include "chrome/browser/enterprise/signals/signals_common.h" 369 #include "chrome/browser/enterprise/signals/signals_common.h"
371-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 370-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
372 371
373 namespace content { 372 namespace content {
374 class BrowserContext; 373 class BrowserContext;
375@@ -39,11 +38,8 @@ struct ContextInfo { 374@@ -40,11 +39,8 @@ struct ContextInfo {
376 std::vector<std::string> on_bulk_data_entry_providers; 375 std::vector<std::string> on_bulk_data_entry_providers;
377 std::vector<std::string> on_security_event_providers; 376 std::vector<std::string> on_security_event_providers;
378 std::string browser_version; 377 std::string browser_version;
@@ -384,18 +383,18 @@
384 absl::optional<bool> chrome_cleanup_enabled; 383 absl::optional<bool> chrome_cleanup_enabled;
385 bool chrome_remote_desktop_app_blocked; 384 bool chrome_remote_desktop_app_blocked;
386 absl::optional<bool> third_party_blocking_enabled; 385 absl::optional<bool> third_party_blocking_enabled;
387--- chrome/browser/enterprise/signals/signals_utils.cc.orig 386--- a/chrome/browser/enterprise/signals/signals_utils.cc
388+++ chrome/browser/enterprise/signals/signals_utils.cc 387+++ b/chrome/browser/enterprise/signals/signals_utils.cc
389@@ -10,7 +10,6 @@ 388@@ -10,7 +10,6 @@
390 #include "components/policy/content/policy_blocklist_service.h" 389 #include "components/policy/content/policy_blocklist_service.h"
391 #include "components/policy/core/browser/url_blocklist_manager.h" 390 #include "components/policy/core/browser/url_blocklist_manager.h"
392 #include "components/prefs/pref_service.h" 391 #include "components/prefs/pref_service.h"
393-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 392-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
394 393
395 #if defined(OS_WIN) 394 #if BUILDFLAG(IS_WIN)
396 #include "components/component_updater/pref_names.h" 395 #include "components/component_updater/pref_names.h"
397--- chrome/browser/enterprise/signals/signals_utils.h.orig 396--- a/chrome/browser/enterprise/signals/signals_utils.h
398+++ chrome/browser/enterprise/signals/signals_utils.h 397+++ b/chrome/browser/enterprise/signals/signals_utils.h
399@@ -5,8 +5,6 @@ 398@@ -5,8 +5,6 @@
400 #ifndef CHROME_BROWSER_ENTERPRISE_SIGNALS_SIGNALS_UTILS_H_ 399 #ifndef CHROME_BROWSER_ENTERPRISE_SIGNALS_SIGNALS_UTILS_H_
401 #define CHROME_BROWSER_ENTERPRISE_SIGNALS_SIGNALS_UTILS_H_ 400 #define CHROME_BROWSER_ENTERPRISE_SIGNALS_SIGNALS_UTILS_H_
@@ -405,8 +404,8 @@
405 #include "third_party/abseil-cpp/absl/types/optional.h" 404 #include "third_party/abseil-cpp/absl/types/optional.h"
406 405
407 class PolicyBlocklistService; 406 class PolicyBlocklistService;
408--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 407--- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
409+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc 408+++ b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
410@@ -77,45 +77,10 @@ api::enterprise_reporting_private::Conte 409@@ -77,45 +77,10 @@ api::enterprise_reporting_private::Conte
411 info.browser_version = std::move(signals.browser_version); 410 info.browser_version = std::move(signals.browser_version);
412 info.built_in_dns_client_enabled = signals.built_in_dns_client_enabled; 411 info.built_in_dns_client_enabled = signals.built_in_dns_client_enabled;
@@ -457,9 +456,9 @@
457 456
458 return info; 457 return info;
459 } 458 }
460--- chrome/browser/extensions/api/identity/identity_apitest.cc.orig 459--- a/chrome/browser/extensions/api/identity/identity_apitest.cc
461+++ chrome/browser/extensions/api/identity/identity_apitest.cc 460+++ b/chrome/browser/extensions/api/identity/identity_apitest.cc
462@@ -56,7 +56,6 @@ 461@@ -57,7 +57,6 @@
463 #include "components/prefs/pref_service.h" 462 #include "components/prefs/pref_service.h"
464 #include "components/signin/core/browser/account_reconcilor.h" 463 #include "components/signin/core/browser/account_reconcilor.h"
465 #include "components/signin/public/base/list_accounts_test_utils.h" 464 #include "components/signin/public/base/list_accounts_test_utils.h"
@@ -467,9 +466,9 @@
467 #include "components/signin/public/base/signin_switches.h" 466 #include "components/signin/public/base/signin_switches.h"
468 #include "components/signin/public/identity_manager/accounts_mutator.h" 467 #include "components/signin/public/identity_manager/accounts_mutator.h"
469 #include "components/signin/public/identity_manager/identity_manager.h" 468 #include "components/signin/public/identity_manager/identity_manager.h"
470--- chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc.orig 469--- a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
471+++ chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc 470+++ b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
472@@ -30,7 +30,6 @@ 471@@ -29,7 +29,6 @@
473 #include "chrome/common/channel_info.h" 472 #include "chrome/common/channel_info.h"
474 #include "chrome/common/extensions/api/identity.h" 473 #include "chrome/common/extensions/api/identity.h"
475 #include "components/prefs/pref_service.h" 474 #include "components/prefs/pref_service.h"
@@ -477,7 +476,7 @@
477 #include "components/signin/public/base/signin_switches.h" 476 #include "components/signin/public/base/signin_switches.h"
478 #include "components/signin/public/identity_manager/access_token_info.h" 477 #include "components/signin/public/identity_manager/access_token_info.h"
479 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" 478 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
480@@ -64,7 +63,7 @@ const char* const kExtensionsIdentityAPI 479@@ -63,7 +62,7 @@ const char* const kExtensionsIdentityAPI
481 "extensions_identity_api"; 480 "extensions_identity_api";
482 481
483 bool IsBrowserSigninAllowed(Profile* profile) { 482 bool IsBrowserSigninAllowed(Profile* profile) {
@@ -486,8 +485,8 @@
486 } 485 }
487 486
488 std::string GetOAuth2MintTokenFlowVersion() { 487 std::string GetOAuth2MintTokenFlowVersion() {
489--- chrome/browser/extensions/api/preference/preference_api.cc.orig 488--- a/chrome/browser/extensions/api/preference/preference_api.cc
490+++ chrome/browser/extensions/api/preference/preference_api.cc 489+++ b/chrome/browser/extensions/api/preference/preference_api.cc
491@@ -35,7 +35,6 @@ 490@@ -35,7 +35,6 @@
492 #include "components/prefs/pref_service.h" 491 #include "components/prefs/pref_service.h"
493 #include "components/privacy_sandbox/privacy_sandbox_prefs.h" 492 #include "components/privacy_sandbox/privacy_sandbox_prefs.h"
@@ -495,8 +494,8 @@
495-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 494-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
496 #include "components/spellcheck/browser/pref_names.h" 495 #include "components/spellcheck/browser/pref_names.h"
497 #include "components/translate/core/browser/translate_pref_names.h" 496 #include "components/translate/core/browser/translate_pref_names.h"
498 #include "extensions/browser/extension_pref_value_map.h" 497 #include "extensions/browser/api/content_settings/content_settings_service.h"
499@@ -109,11 +108,6 @@ const PrefMappingEntry kPrefMapping[] = 498@@ -110,11 +109,6 @@ const PrefMappingEntry kPrefMapping[] =
500 APIPermissionID::kPrivacy}, 499 APIPermissionID::kPrivacy},
501 {"doNotTrackEnabled", prefs::kEnableDoNotTrack, APIPermissionID::kPrivacy, 500 {"doNotTrackEnabled", prefs::kEnableDoNotTrack, APIPermissionID::kPrivacy,
502 APIPermissionID::kPrivacy}, 501 APIPermissionID::kPrivacy},
@@ -508,7 +507,7 @@
508 {"searchSuggestEnabled", prefs::kSearchSuggestEnabled, 507 {"searchSuggestEnabled", prefs::kSearchSuggestEnabled,
509 APIPermissionID::kPrivacy, APIPermissionID::kPrivacy}, 508 APIPermissionID::kPrivacy, APIPermissionID::kPrivacy},
510 {"spellingServiceEnabled", spellcheck::prefs::kSpellCheckUseSpellingService, 509 {"spellingServiceEnabled", spellcheck::prefs::kSpellCheckUseSpellingService,
511@@ -844,18 +838,6 @@ ExtensionFunction::ResponseAction SetPre 510@@ -845,18 +839,6 @@ ExtensionFunction::ResponseAction SetPre
512 base::Value(browser_pref_value->GetBool())); 511 base::Value(browser_pref_value->GetBool()));
513 } 512 }
514 513
@@ -527,7 +526,7 @@
527 preference_api->SetExtensionControlledPref( 526 preference_api->SetExtensionControlledPref(
528 extension_id(), browser_pref, scope, 527 extension_id(), browser_pref, scope,
529 base::Value::FromUniquePtrValue(std::move(browser_pref_value))); 528 base::Value::FromUniquePtrValue(std::move(browser_pref_value)));
530@@ -908,18 +890,6 @@ ExtensionFunction::ResponseAction ClearP 529@@ -909,18 +891,6 @@ ExtensionFunction::ResponseAction ClearP
531 PreferenceAPI::Get(browser_context()) 530 PreferenceAPI::Get(browser_context())
532 ->RemoveExtensionControlledPref(extension_id(), browser_pref, scope); 531 ->RemoveExtensionControlledPref(extension_id(), browser_pref, scope);
533 532
@@ -546,9 +545,9 @@
546 return RespondNow(NoArguments()); 545 return RespondNow(NoArguments());
547 } 546 }
548 547
549--- chrome/browser/extensions/api/preference/preference_apitest.cc.orig 548--- a/chrome/browser/extensions/api/preference/preference_apitest.cc
550+++ chrome/browser/extensions/api/preference/preference_apitest.cc 549+++ b/chrome/browser/extensions/api/preference/preference_apitest.cc
551@@ -28,7 +28,6 @@ 550@@ -31,7 +31,6 @@
552 #include "components/keep_alive_registry/scoped_keep_alive.h" 551 #include "components/keep_alive_registry/scoped_keep_alive.h"
553 #include "components/password_manager/core/common/password_manager_pref_names.h" 552 #include "components/password_manager/core/common/password_manager_pref_names.h"
554 #include "components/prefs/pref_service.h" 553 #include "components/prefs/pref_service.h"
@@ -556,43 +555,43 @@
556 #include "components/translate/core/browser/translate_pref_names.h" 555 #include "components/translate/core/browser/translate_pref_names.h"
557 #include "content/public/browser/notification_service.h" 556 #include "content/public/browser/notification_service.h"
558 #include "content/public/test/browser_test.h" 557 #include "content/public/test/browser_test.h"
559@@ -73,7 +72,6 @@ class ExtensionPreferenceApiTest : publi 558@@ -86,7 +85,6 @@ class ExtensionPreferenceApiTest
560 prefs->GetInteger(prefs::kNetworkPredictionOptions)); 559 prefs->GetInteger(prefetch::prefs::kNetworkPredictionOptions));
561 EXPECT_TRUE( 560 EXPECT_TRUE(
562 prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService)); 561 prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService));
563- EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled)); 562- EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
564 EXPECT_TRUE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); 563 EXPECT_TRUE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
565 } 564 }
566 565
567@@ -99,7 +97,6 @@ class ExtensionPreferenceApiTest : publi 566@@ -112,7 +110,6 @@ class ExtensionPreferenceApiTest
568 prefs->GetInteger(prefs::kNetworkPredictionOptions)); 567 prefs->GetInteger(prefetch::prefs::kNetworkPredictionOptions));
569 EXPECT_FALSE( 568 EXPECT_FALSE(
570 prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService)); 569 prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService));
571- EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled)); 570- EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
572 EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); 571 EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
573 } 572 }
574 573
575@@ -163,7 +160,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionPreferen 574@@ -185,7 +182,6 @@ IN_PROC_BROWSER_TEST_P(ExtensionPreferen
576 prefs->SetInteger(prefs::kNetworkPredictionOptions, 575 prefetch::prefs::kNetworkPredictionOptions,
577 chrome_browser_net::NETWORK_PREDICTION_NEVER); 576 static_cast<int>(prefetch::NetworkPredictionOptions::kDisabled));
578 prefs->SetBoolean(password_manager::prefs::kCredentialsEnableService, false); 577 prefs->SetBoolean(password_manager::prefs::kCredentialsEnableService, false);
579- prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false); 578- prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false);
580 prefs->SetBoolean(prefs::kSearchSuggestEnabled, false); 579 prefs->SetBoolean(prefs::kSearchSuggestEnabled, false);
581 prefs->SetString(prefs::kWebRTCIPHandlingPolicy, 580 prefs->SetString(prefs::kWebRTCIPHandlingPolicy,
582 blink::kWebRTCIPHandlingDefaultPublicInterfaceOnly); 581 blink::kWebRTCIPHandlingDefaultPublicInterfaceOnly);
583--- chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc.orig 582--- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
584+++ chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc 583+++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
585@@ -36,7 +36,6 @@ 584@@ -39,7 +39,6 @@
586 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" 585 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
587 #include "components/prefs/pref_service.h" 586 #include "components/prefs/pref_service.h"
588 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" 587 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
589-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 588-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
590 #include "components/signin/public/identity_manager/identity_manager.h" 589 #include "components/signin/public/identity_manager/identity_manager.h"
591 #include "content/public/browser/browser_context.h" 590 #include "components/url_matcher/url_matcher.h"
592 #include "extensions/browser/event_router.h" 591 #include "components/url_matcher/url_util.h"
593--- chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc.orig 592--- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc
594+++ chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc 593+++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc
595@@ -35,7 +35,6 @@ 594@@ -36,7 +36,6 @@
596 #include "components/policy/core/common/cloud/mock_cloud_policy_client.h" 595 #include "components/policy/core/common/cloud/mock_cloud_policy_client.h"
597 #include "components/policy/core/common/cloud/realtime_reporting_job_configuration.h" 596 #include "components/policy/core/common/cloud/realtime_reporting_job_configuration.h"
598 #include "components/safe_browsing/core/common/features.h" 597 #include "components/safe_browsing/core/common/features.h"
@@ -600,8 +599,8 @@
600 #include "components/signin/public/identity_manager/identity_test_environment.h" 599 #include "components/signin/public/identity_manager/identity_test_environment.h"
601 #include "content/public/test/browser_task_environment.h" 600 #include "content/public/test/browser_task_environment.h"
602 #include "extensions/browser/test_event_router.h" 601 #include "extensions/browser/test_event_router.h"
603--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 602--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
604+++ chrome/browser/extensions/api/settings_private/prefs_util.cc 603+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
605@@ -43,7 +43,6 @@ 604@@ -43,7 +43,6 @@
606 #include "components/prefs/pref_service.h" 605 #include "components/prefs/pref_service.h"
607 #include "components/privacy_sandbox/privacy_sandbox_prefs.h" 606 #include "components/privacy_sandbox/privacy_sandbox_prefs.h"
@@ -610,7 +609,7 @@
610 #include "components/search_engines/default_search_manager.h" 609 #include "components/search_engines/default_search_manager.h"
611 #include "components/spellcheck/browser/pref_names.h" 610 #include "components/spellcheck/browser/pref_names.h"
612 #include "components/translate/core/browser/translate_pref_names.h" 611 #include "components/translate/core/browser/translate_pref_names.h"
613@@ -283,16 +282,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil 612@@ -295,16 +294,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
614 settings_api::PrefType::PREF_TYPE_BOOLEAN; 613 settings_api::PrefType::PREF_TYPE_BOOLEAN;
615 614
616 // Security page 615 // Security page
@@ -627,9 +626,9 @@
627 (*s_allowlist)[::prefs::kHttpsOnlyModeEnabled] = 626 (*s_allowlist)[::prefs::kHttpsOnlyModeEnabled] =
628 settings_api::PrefType::PREF_TYPE_BOOLEAN; 627 settings_api::PrefType::PREF_TYPE_BOOLEAN;
629 628
630--- chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc.orig 629--- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
631+++ chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc 630+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
632@@ -647,9 +647,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore 631@@ -649,9 +649,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore
633 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateGetReferrerChainApiTest, 632 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateGetReferrerChainApiTest,
634 GetReferrerChainForNonSafeBrowsingUser) { 633 GetReferrerChainForNonSafeBrowsingUser) {
635 PrefService* pref_service = browser()->profile()->GetPrefs(); 634 PrefService* pref_service = browser()->profile()->GetPrefs();
@@ -639,9 +638,9 @@
639 638
640 GURL page_url = GetTestServerURLWithReferrers("empty_referrer_chain.html"); 639 GURL page_url = GetTestServerURLWithReferrers("empty_referrer_chain.html");
641 ASSERT_TRUE(OpenTestURL(page_url)); 640 ASSERT_TRUE(OpenTestURL(page_url));
642--- chrome/browser/extensions/extension_allowlist.cc.orig 641--- a/chrome/browser/extensions/extension_allowlist.cc
643+++ chrome/browser/extensions/extension_allowlist.cc 642+++ b/chrome/browser/extensions/extension_allowlist.cc
644@@ -9,7 +9,6 @@ 643@@ -10,7 +10,6 @@
645 #include "chrome/browser/profiles/profile.h" 644 #include "chrome/browser/profiles/profile.h"
646 #include "chrome/browser/safe_browsing/safe_browsing_metrics_collector_factory.h" 645 #include "chrome/browser/safe_browsing/safe_browsing_metrics_collector_factory.h"
647 #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h" 646 #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h"
@@ -649,7 +648,7 @@
649 #include "extensions/browser/allowlist_state.h" 648 #include "extensions/browser/allowlist_state.h"
650 #include "extensions/browser/extension_registry.h" 649 #include "extensions/browser/extension_registry.h"
651 #include "extensions/browser/extension_system.h" 650 #include "extensions/browser/extension_system.h"
652@@ -68,10 +67,6 @@ ExtensionAllowlist::ExtensionAllowlist(P 651@@ -69,10 +68,6 @@ ExtensionAllowlist::ExtensionAllowlist(P
653 // Register to Enhanced Safe Browsing setting changes for allowlist 652 // Register to Enhanced Safe Browsing setting changes for allowlist
654 // enforcements. 653 // enforcements.
655 pref_change_registrar_.Init(profile_->GetPrefs()); 654 pref_change_registrar_.Init(profile_->GetPrefs());
@@ -660,7 +659,7 @@
660 } 659 }
661 660
662 ExtensionAllowlist::~ExtensionAllowlist() = default; 661 ExtensionAllowlist::~ExtensionAllowlist() = default;
663@@ -240,15 +235,8 @@ void ExtensionAllowlist::OnExtensionInst 662@@ -241,15 +236,8 @@ void ExtensionAllowlist::OnExtensionInst
664 } 663 }
665 664
666 void ExtensionAllowlist::SetAllowlistEnforcementFields() { 665 void ExtensionAllowlist::SetAllowlistEnforcementFields() {
@@ -676,7 +675,7 @@
676 } 675 }
677 676
678 // `ApplyEnforcement` can be called when an extension becomes not allowlisted or 677 // `ApplyEnforcement` can be called when an extension becomes not allowlisted or
679@@ -398,15 +386,6 @@ void ExtensionAllowlist::NotifyExtension 678@@ -399,15 +387,6 @@ void ExtensionAllowlist::NotifyExtension
680 } 679 }
681 680
682 void ExtensionAllowlist::ReportExtensionReEnabledEvent() { 681 void ExtensionAllowlist::ReportExtensionReEnabledEvent() {
@@ -692,9 +691,17 @@
692 } 691 }
693 692
694 } // namespace extensions 693 } // namespace extensions
695--- chrome/browser/extensions/installed_loader.cc.orig 694--- a/chrome/browser/extensions/installed_loader.cc
696+++ chrome/browser/extensions/installed_loader.cc 695+++ b/chrome/browser/extensions/installed_loader.cc
697@@ -797,12 +797,6 @@ void InstalledLoader::RecordExtensionsMe 696@@ -28,7 +28,6 @@
697 #include "chrome/common/extensions/chrome_manifest_url_handlers.h"
698 #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h"
699 #include "chrome/common/webui_url_constants.h"
700-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
701 #include "content/public/browser/browser_thread.h"
702 #include "content/public/browser/notification_service.h"
703 #include "content/public/common/url_constants.h"
704@@ -798,12 +797,6 @@ void InstalledLoader::RecordExtensionsMe
698 enabled_not_allowlisted_count); 705 enabled_not_allowlisted_count);
699 base::UmaHistogramCounts100("Extensions.NotAllowlistedDisabled", 706 base::UmaHistogramCounts100("Extensions.NotAllowlistedDisabled",
700 disabled_not_allowlisted_count); 707 disabled_not_allowlisted_count);
@@ -707,9 +714,9 @@
707 } 714 }
708 715
709 int InstalledLoader::GetCreationFlags(const ExtensionInfo* info) { 716 int InstalledLoader::GetCreationFlags(const ExtensionInfo* info) {
710--- chrome/browser/net/profile_network_context_service.cc.orig 717--- a/chrome/browser/net/profile_network_context_service.cc
711+++ chrome/browser/net/profile_network_context_service.cc 718+++ b/chrome/browser/net/profile_network_context_service.cc
712@@ -43,7 +43,6 @@ 719@@ -46,7 +46,6 @@
713 #include "components/pref_registry/pref_registry_syncable.h" 720 #include "components/pref_registry/pref_registry_syncable.h"
714 #include "components/prefs/pref_registry_simple.h" 721 #include "components/prefs/pref_registry_simple.h"
715 #include "components/prefs/pref_service.h" 722 #include "components/prefs/pref_service.h"
@@ -717,22 +724,24 @@
717 #include "content/public/browser/browser_context.h" 724 #include "content/public/browser/browser_context.h"
718 #include "content/public/browser/browser_thread.h" 725 #include "content/public/browser/browser_thread.h"
719 #include "content/public/browser/network_service_instance.h" 726 #include "content/public/browser/network_service_instance.h"
720@@ -741,13 +740,6 @@ void ProfileNetworkContextService::Confi 727@@ -806,15 +805,8 @@ void ProfileNetworkContextService::Confi
721 network_context_params->enable_certificate_reporting = true; 728 network_context_params->enable_certificate_reporting = true;
722 network_context_params->enable_expect_ct_reporting = true; 729 network_context_params->enable_expect_ct_reporting = true;
723 730
724- // Initialize the network context to do SCT auditing only if the current 731- SCTReportingService* sct_reporting_service =
725- // profile is opted in to Safe Browsing Extended Reporting. 732- SCTReportingServiceFactory::GetForBrowserContext(profile_);
726- if (!profile_->IsOffTheRecord() && 733- if (sct_reporting_service) {
727- safe_browsing::IsExtendedReportingEnabled(*profile_->GetPrefs())) { 734- network_context_params->sct_auditing_mode =
728- network_context_params->enable_sct_auditing = true; 735- sct_reporting_service->GetReportingMode();
736- } else {
737 network_context_params->sct_auditing_mode =
738 network::mojom::SCTAuditingMode::kDisabled;
729- } 739- }
730- 740
731 network_context_params->ct_policy = GetCTPolicy(); 741 network_context_params->ct_policy = GetCTPolicy();
732 742
733 #if BUILDFLAG(TRIAL_COMPARISON_CERT_VERIFIER_SUPPORTED) 743--- a/chrome/browser/net/trial_comparison_cert_verifier_browsertest.cc
734--- chrome/browser/net/trial_comparison_cert_verifier_browsertest.cc.orig 744+++ b/chrome/browser/net/trial_comparison_cert_verifier_browsertest.cc
735+++ chrome/browser/net/trial_comparison_cert_verifier_browsertest.cc
736@@ -11,7 +11,6 @@ 745@@ -11,7 +11,6 @@
737 #include "chrome/test/base/in_process_browser_test.h" 746 #include "chrome/test/base/in_process_browser_test.h"
738 #include "chrome/test/base/ui_test_utils.h" 747 #include "chrome/test/base/ui_test_utils.h"
@@ -741,9 +750,9 @@
741 #include "content/public/test/browser_test.h" 750 #include "content/public/test/browser_test.h"
742 #include "net/base/features.h" 751 #include "net/base/features.h"
743 #include "net/cert/trial_comparison_cert_verifier.h" 752 #include "net/cert/trial_comparison_cert_verifier.h"
744--- chrome/browser/net/trial_comparison_cert_verifier_controller.cc.orig 753--- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
745+++ chrome/browser/net/trial_comparison_cert_verifier_controller.cc 754+++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
746@@ -19,7 +19,6 @@ 755@@ -18,7 +18,6 @@
747 #include "chrome/browser/safe_browsing/certificate_reporting_service.h" 756 #include "chrome/browser/safe_browsing/certificate_reporting_service.h"
748 #include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h" 757 #include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h"
749 #include "chrome/common/channel_info.h" 758 #include "chrome/common/channel_info.h"
@@ -751,7 +760,7 @@
751 #include "components/security_interstitials/content/certificate_error_report.h" 760 #include "components/security_interstitials/content/certificate_error_report.h"
752 #include "content/public/browser/browser_task_traits.h" 761 #include "content/public/browser/browser_task_traits.h"
753 #include "content/public/browser/browser_thread.h" 762 #include "content/public/browser/browser_thread.h"
754@@ -42,12 +41,6 @@ TrialComparisonCertVerifierController::T 763@@ -41,12 +40,6 @@ TrialComparisonCertVerifierController::T
755 // enabled. 764 // enabled.
756 return; 765 return;
757 } 766 }
@@ -764,7 +773,7 @@
764 } 773 }
765 774
766 TrialComparisonCertVerifierController:: 775 TrialComparisonCertVerifierController::
767@@ -101,9 +94,7 @@ bool TrialComparisonCertVerifierControll 776@@ -100,9 +93,7 @@ bool TrialComparisonCertVerifierControll
768 if (!MaybeAllowedForProfile(profile_)) 777 if (!MaybeAllowedForProfile(profile_))
769 return false; 778 return false;
770 779
@@ -775,8 +784,8 @@
775 } 784 }
776 785
777 void TrialComparisonCertVerifierController::SendTrialReport( 786 void TrialComparisonCertVerifierController::SendTrialReport(
778--- chrome/browser/net/trial_comparison_cert_verifier_controller.h.orig 787--- a/chrome/browser/net/trial_comparison_cert_verifier_controller.h
779+++ chrome/browser/net/trial_comparison_cert_verifier_controller.h 788+++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.h
780@@ -14,7 +14,6 @@ 789@@ -14,7 +14,6 @@
781 #include "base/memory/ref_counted.h" 790 #include "base/memory/ref_counted.h"
782 #include "base/memory/weak_ptr.h" 791 #include "base/memory/weak_ptr.h"
@@ -788,13 +797,13 @@
788@@ -77,7 +76,6 @@ class TrialComparisonCertVerifierControl 797@@ -77,7 +76,6 @@ class TrialComparisonCertVerifierControl
789 void RefreshState(); 798 void RefreshState();
790 799
791 Profile* profile_; 800 raw_ptr<Profile> profile_;
792- PrefChangeRegistrar pref_change_registrar_; 801- PrefChangeRegistrar pref_change_registrar_;
793 802
794 mojo::ReceiverSet< 803 mojo::ReceiverSet<
795 cert_verifier::mojom::TrialComparisonCertVerifierReportClient> 804 cert_verifier::mojom::TrialComparisonCertVerifierReportClient>
796--- chrome/browser/net/trial_comparison_cert_verifier_controller_unittest.cc.orig 805--- a/chrome/browser/net/trial_comparison_cert_verifier_controller_unittest.cc
797+++ chrome/browser/net/trial_comparison_cert_verifier_controller_unittest.cc 806+++ b/chrome/browser/net/trial_comparison_cert_verifier_controller_unittest.cc
798@@ -20,7 +20,6 @@ 807@@ -20,7 +20,6 @@
799 #include "chrome/test/base/testing_browser_process.h" 808 #include "chrome/test/base/testing_browser_process.h"
800 #include "chrome/test/base/testing_profile.h" 809 #include "chrome/test/base/testing_profile.h"
@@ -803,17 +812,17 @@
803 #include "components/security_interstitials/content/cert_logger.pb.h" 812 #include "components/security_interstitials/content/cert_logger.pb.h"
804 #include "components/sync_preferences/testing_pref_service_syncable.h" 813 #include "components/sync_preferences/testing_pref_service_syncable.h"
805 #include "content/public/browser/browser_task_traits.h" 814 #include "content/public/browser/browser_task_traits.h"
806--- chrome/browser/password_manager/generated_password_leak_detection_pref.cc.orig 815--- a/chrome/browser/password_manager/generated_password_leak_detection_pref.cc
807+++ chrome/browser/password_manager/generated_password_leak_detection_pref.cc 816+++ b/chrome/browser/password_manager/generated_password_leak_detection_pref.cc
808@@ -13,7 +13,6 @@ 817@@ -14,7 +14,6 @@
809 #include "chrome/common/extensions/api/settings_private.h" 818 #include "components/password_manager/core/common/password_manager_features.h"
810 #include "components/password_manager/core/common/password_manager_pref_names.h" 819 #include "components/password_manager/core/common/password_manager_pref_names.h"
811 #include "components/prefs/pref_service.h" 820 #include "components/prefs/pref_service.h"
812-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 821-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
813 #include "components/signin/public/identity_manager/identity_manager.h" 822 #include "components/signin/public/identity_manager/identity_manager.h"
814 823
815 namespace { 824 namespace {
816@@ -43,8 +42,7 @@ bool IsUserSignedInAndSyncing(Profile* p 825@@ -37,8 +36,7 @@ bool IsUserAllowedToUseLeakDetection(Pro
817 // Returns whether the effective value of the Safe Browsing preferences for 826 // Returns whether the effective value of the Safe Browsing preferences for
818 // |profile| is standard protection. 827 // |profile| is standard protection.
819 bool IsSafeBrowsingStandard(Profile* profile) { 828 bool IsSafeBrowsingStandard(Profile* profile) {
@@ -823,7 +832,7 @@
823 } 832 }
824 833
825 } // namespace 834 } // namespace
826@@ -63,16 +61,6 @@ GeneratedPasswordLeakDetectionPref::Gene 835@@ -57,16 +55,6 @@ GeneratedPasswordLeakDetectionPref::Gene
827 base::BindRepeating( 836 base::BindRepeating(
828 &GeneratedPasswordLeakDetectionPref::OnSourcePreferencesChanged, 837 &GeneratedPasswordLeakDetectionPref::OnSourcePreferencesChanged,
829 base::Unretained(this))); 838 base::Unretained(this)));
@@ -840,8 +849,8 @@
840 849
841 if (auto* identity_manager = IdentityManagerFactory::GetForProfile(profile)) 850 if (auto* identity_manager = IdentityManagerFactory::GetForProfile(profile))
842 identity_manager_observer_.Observe(identity_manager); 851 identity_manager_observer_.Observe(identity_manager);
843--- chrome/browser/permissions/abusive_origin_permission_revocation_request.cc.orig 852--- a/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc
844+++ chrome/browser/permissions/abusive_origin_permission_revocation_request.cc 853+++ b/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc
845@@ -17,7 +17,6 @@ 854@@ -17,7 +17,6 @@
846 #include "components/permissions/permissions_client.h" 855 #include "components/permissions/permissions_client.h"
847 #include "components/prefs/pref_service.h" 856 #include "components/prefs/pref_service.h"
@@ -850,18 +859,18 @@
850 859
851 namespace { 860 namespace {
852 constexpr char kExcludedKey[] = "exempted"; 861 constexpr char kExcludedKey[] = "exempted";
853--- chrome/browser/permissions/prediction_based_permission_ui_selector.cc.orig 862--- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
854+++ chrome/browser/permissions/prediction_based_permission_ui_selector.cc 863+++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
855@@ -23,7 +23,6 @@ 864@@ -26,7 +26,6 @@
856 #include "components/permissions/prediction_service/prediction_service.h" 865 #include "components/permissions/prediction_service/prediction_service.h"
857 #include "components/permissions/prediction_service/prediction_service_messages.pb.h" 866 #include "components/permissions/prediction_service/prediction_service_messages.pb.h"
858 #include "components/prefs/pref_service.h" 867 #include "components/prefs/pref_service.h"
859-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 868-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
860 869
861 namespace { 870 #if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
862 871 #include "chrome/browser/permissions/prediction_model_handler_factory.h"
863--- chrome/browser/policy/browser_signin_policy_handler.cc.orig 872--- a/chrome/browser/policy/browser_signin_policy_handler.cc
864+++ chrome/browser/policy/browser_signin_policy_handler.cc 873+++ b/chrome/browser/policy/browser_signin_policy_handler.cc
865@@ -15,7 +15,6 @@ 874@@ -15,7 +15,6 @@
866 #include "components/policy/core/common/policy_map.h" 875 #include "components/policy/core/common/policy_map.h"
867 #include "components/policy/policy_constants.h" 876 #include "components/policy/policy_constants.h"
@@ -870,13 +879,13 @@
870 879
871 namespace policy { 880 namespace policy {
872 BrowserSigninPolicyHandler::BrowserSigninPolicyHandler(Schema chrome_schema) 881 BrowserSigninPolicyHandler::BrowserSigninPolicyHandler(Schema chrome_schema)
873@@ -48,28 +47,18 @@ void BrowserSigninPolicyHandler::ApplyPo 882@@ -49,28 +48,18 @@ void BrowserSigninPolicyHandler::ApplyPo
874 #endif 883 #endif
875 FALLTHROUGH; 884 [[fallthrough]];
876 case BrowserSigninMode::kEnabled: 885 case BrowserSigninMode::kEnabled:
877+#if !defined(OS_ANDROID) 886+#if !BUILDFLAG(IS_ANDROID)
878 prefs->SetValue( 887 prefs->SetValue(
879-#if defined(OS_ANDROID) 888-#if BUILDFLAG(IS_ANDROID)
880- // The new kSigninAllowedOnNextStartup pref is only used on Desktop. 889- // The new kSigninAllowedOnNextStartup pref is only used on Desktop.
881- // Keep the old kSigninAllowed pref for Android until the policy is 890- // Keep the old kSigninAllowed pref for Android until the policy is
882- // fully deprecated in M71 and can be removed. 891- // fully deprecated in M71 and can be removed.
@@ -888,9 +897,9 @@
888+#endif 897+#endif
889 break; 898 break;
890 case BrowserSigninMode::kDisabled: 899 case BrowserSigninMode::kDisabled:
891+#if !defined(OS_ANDROID) 900+#if !BUILDFLAG(IS_ANDROID)
892 prefs->SetValue( 901 prefs->SetValue(
893-#if defined(OS_ANDROID) 902-#if BUILDFLAG(IS_ANDROID)
894- // The new kSigninAllowedOnNextStartup pref is only used on Desktop. 903- // The new kSigninAllowedOnNextStartup pref is only used on Desktop.
895- // Keep the old kSigninAllowed pref for Android until the policy is 904- // Keep the old kSigninAllowed pref for Android until the policy is
896- // fully deprecated in M71 and can be removed. 905- // fully deprecated in M71 and can be removed.
@@ -903,12 +912,12 @@
903 break; 912 break;
904 } 913 }
905 } 914 }
906--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 915--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
907+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc 916+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
908@@ -83,12 +83,9 @@ 917@@ -94,12 +94,9 @@
909 #include "components/policy/core/common/schema.h"
910 #include "components/policy/policy_constants.h"
911 #include "components/proxy_config/proxy_policy_handler.h" 918 #include "components/proxy_config/proxy_policy_handler.h"
919 #include "components/safe_browsing/buildflags.h"
920 #include "components/safe_browsing/content/common/file_type_policies_prefs.h"
912-#include "components/safe_browsing/core/common/safe_browsing_policy_handler.h" 921-#include "components/safe_browsing/core/common/safe_browsing_policy_handler.h"
913-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 922-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
914 #include "components/search_engines/default_search_policy_handler.h" 923 #include "components/search_engines/default_search_policy_handler.h"
@@ -918,39 +927,76 @@
918 #include "components/spellcheck/spellcheck_buildflags.h" 927 #include "components/spellcheck/spellcheck_buildflags.h"
919 #include "components/sync/base/pref_names.h" 928 #include "components/sync/base/pref_names.h"
920 #include "components/sync/driver/sync_policy_handler.h" 929 #include "components/sync/driver/sync_policy_handler.h"
921@@ -209,15 +206,6 @@ const PolicyToPreferenceMapEntry kSimple 930@@ -207,9 +204,6 @@ const PolicyToPreferenceMapEntry kSimple
922 { key::kQuicAllowed, 931 { key::kDefaultPopupsSetting,
923 prefs::kQuicAllowed, 932 prefs::kManagedDefaultPopupsSetting,
933 base::Value::Type::INTEGER },
934- { key::kDisableSafeBrowsingProceedAnyway,
935- prefs::kSafeBrowsingProceedAnywayDisabled,
936- base::Value::Type::BOOLEAN },
937 { key::kEditBookmarksEnabled,
938 bookmarks::prefs::kEditBookmarksEnabled,
924 base::Value::Type::BOOLEAN }, 939 base::Value::Type::BOOLEAN },
940@@ -230,9 +224,6 @@ const PolicyToPreferenceMapEntry kSimple
941 prefs::kPrintingEnabled,
942 base::Value::Type::BOOLEAN },
943 #endif // BUILDFLAG(ENABLE_PRINTING)
925- { key::kSafeBrowsingEnabled, 944- { key::kSafeBrowsingEnabled,
926- prefs::kSafeBrowsingEnabled, 945- prefs::kSafeBrowsingEnabled,
927- base::Value::Type::BOOLEAN }, 946- base::Value::Type::BOOLEAN },
928- { key::kSafeBrowsingForTrustedSourcesEnabled, 947 { key::kSavingBrowserHistoryDisabled,
929- prefs::kSafeBrowsingForTrustedSourcesEnabled, 948 prefs::kSavingBrowserHistoryDisabled,
930- base::Value::Type::BOOLEAN }, 949 base::Value::Type::BOOLEAN },
931- { key::kSafeBrowsingExtendedReportingEnabled, 950@@ -291,9 +282,6 @@ const PolicyToPreferenceMapEntry kSimple
932- prefs::kSafeBrowsingScoutReportingEnabled, 951 { key::kAdsSettingForIntrusiveAdsSites,
952 prefs::kManagedDefaultAdsSetting,
953 base::Value::Type::INTEGER },
954- { key::kAdvancedProtectionAllowed,
955- prefs::kAdvancedProtectionAllowed,
933- base::Value::Type::BOOLEAN }, 956- base::Value::Type::BOOLEAN },
934 { key::kUrlKeyedAnonymizedDataCollectionEnabled, 957 { key::kAllowCrossOriginAuthPrompt,
935 unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled, 958 prefs::kAllowCrossOriginAuthPrompt,
936 base::Value::Type::BOOLEAN }, 959 base::Value::Type::BOOLEAN },
937@@ -353,15 +341,6 @@ const PolicyToPreferenceMapEntry kSimple 960@@ -482,15 +470,6 @@ const PolicyToPreferenceMapEntry kSimple
938 { key::kGloballyScopeHTTPAuthCacheEnabled, 961 { key::kPasswordDismissCompromisedAlertEnabled,
939 prefs::kGloballyScopeHTTPAuthCacheEnabled, 962 password_manager::prefs::kPasswordDismissCompromisedAlertEnabled,
940 base::Value::Type::BOOLEAN }, 963 base::Value::Type::BOOLEAN },
964- { key::kPasswordProtectionChangePasswordURL,
965- prefs::kPasswordProtectionChangePasswordURL,
966- base::Value::Type::STRING },
967- { key::kPasswordProtectionLoginURLs,
968- prefs::kPasswordProtectionLoginURLs,
969- base::Value::Type::LIST },
941- { key::kPasswordProtectionWarningTrigger, 970- { key::kPasswordProtectionWarningTrigger,
942- prefs::kPasswordProtectionWarningTrigger, 971- prefs::kPasswordProtectionWarningTrigger,
943- base::Value::Type::INTEGER }, 972- base::Value::Type::INTEGER },
944- { key::kPasswordProtectionLoginURLs, 973 { key::kPolicyRefreshRate,
945- prefs::kPasswordProtectionLoginURLs, 974 policy_prefs::kUserPolicyRefreshRate,
975 base::Value::Type::INTEGER },
976@@ -526,9 +505,6 @@ const PolicyToPreferenceMapEntry kSimple
977 { key::kRestoreOnStartupURLs,
978 prefs::kURLsToRestoreOnStartup,
979 base::Value::Type::LIST },
980- { key::kSafeBrowsingAllowlistDomains,
981- prefs::kSafeBrowsingAllowlistDomains,
946- base::Value::Type::LIST }, 982- base::Value::Type::LIST },
947- { key::kPasswordProtectionChangePasswordURL,
948- prefs::kPasswordProtectionChangePasswordURL,
949- base::Value::Type::STRING },
950 { key::kSafeSitesFilterBehavior, 983 { key::kSafeSitesFilterBehavior,
951 policy_prefs::kSafeSitesFilterBehavior, 984 policy_prefs::kSafeSitesFilterBehavior,
952 base::Value::Type::INTEGER }, 985 base::Value::Type::INTEGER },
953@@ -470,18 +449,12 @@ const PolicyToPreferenceMapEntry kSimple 986@@ -653,12 +629,6 @@ const PolicyToPreferenceMapEntry kSimple
987 { key::kAdditionalDnsQueryTypesEnabled,
988 prefs::kAdditionalDnsQueryTypesEnabled,
989 base::Value::Type::BOOLEAN },
990- { key::kSafeBrowsingForTrustedSourcesEnabled,
991- prefs::kSafeBrowsingForTrustedSourcesEnabled,
992- base::Value::Type::BOOLEAN },
993- { key::kSafeBrowsingExtendedReportingEnabled,
994- prefs::kSafeBrowsingScoutReportingEnabled,
995- base::Value::Type::BOOLEAN },
996 { key::kForceGoogleSafeSearch,
997 prefs::kForceGoogleSafeSearch,
998 base::Value::Type::BOOLEAN },
999@@ -816,9 +786,6 @@ const PolicyToPreferenceMapEntry kSimple
954 { key::kMaxConnectionsPerProxy, 1000 { key::kMaxConnectionsPerProxy,
955 prefs::kMaxConnectionsPerProxy, 1001 prefs::kMaxConnectionsPerProxy,
956 base::Value::Type::INTEGER }, 1002 base::Value::Type::INTEGER },
@@ -960,48 +1006,10 @@
960 { key::kDefaultWebBluetoothGuardSetting, 1006 { key::kDefaultWebBluetoothGuardSetting,
961 prefs::kManagedDefaultWebBluetoothGuardSetting, 1007 prefs::kManagedDefaultWebBluetoothGuardSetting,
962 base::Value::Type::INTEGER }, 1008 base::Value::Type::INTEGER },
963 { key::kDefaultMediaStreamSetting, 1009@@ -1782,12 +1749,6 @@ std::unique_ptr<ConfigurationPolicyHandl
964 prefs::kManagedDefaultMediaStreamSetting, 1010 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
965 base::Value::Type::INTEGER }, 1011 SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED));
966- { key::kDisableSafeBrowsingProceedAnyway, 1012
967- prefs::kSafeBrowsingProceedAnywayDisabled,
968- base::Value::Type::BOOLEAN },
969 { key::kCECPQ2Enabled,
970 prefs::kCECPQ2Enabled,
971 base::Value::Type::BOOLEAN },
972@@ -684,9 +657,6 @@ const PolicyToPreferenceMapEntry kSimple
973 { key::kIntranetRedirectBehavior,
974 omnibox::kIntranetRedirectBehavior,
975 base::Value::Type::INTEGER },
976- { key::kAdvancedProtectionAllowed,
977- prefs::kAdvancedProtectionAllowed,
978- base::Value::Type::BOOLEAN },
979 { key::kAccessibilityImageLabelsEnabled,
980 prefs::kAccessibilityImageLabelsEnabled,
981 base::Value::Type::BOOLEAN },
982@@ -1642,8 +1612,6 @@ std::unique_ptr<ConfigurationPolicyHandl
983 handlers->AddHandler(std::make_unique<JavascriptPolicyHandler>());
984 handlers->AddHandler(std::make_unique<NetworkPredictionPolicyHandler>());
985 handlers->AddHandler(std::make_unique<RestoreOnStartupPolicyHandler>());
986- handlers->AddHandler(
987- std::make_unique<safe_browsing::SafeBrowsingPolicyHandler>());
988 handlers->AddHandler(std::make_unique<SimpleDeprecatingPolicyHandler>(
989 std::make_unique<SimplePolicyHandler>(key::kAuthServerWhitelist,
990 prefs::kAuthServerAllowlist,
991@@ -1667,9 +1635,6 @@ std::unique_ptr<ConfigurationPolicyHandl
992 key::kWindowOcclusionEnabled,
993 policy::policy_prefs::kNativeWindowOcclusionEnabled,
994 base::Value::Type::BOOLEAN)));
995- handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
996- key::kSafeBrowsingAllowlistDomains, prefs::kSafeBrowsingAllowlistDomains,
997- base::Value::Type::LIST));
998 handlers->AddHandler(std::make_unique<syncer::SyncPolicyHandler>());
999 handlers->AddHandler(std::make_unique<BrowsingHistoryPolicyHandler>());
1000
1001@@ -1762,12 +1727,6 @@ std::unique_ptr<ConfigurationPolicyHandl
1002 key::kOnSecurityEventEnterpriseConnector,
1003 enterprise_connectors::kOnSecurityEventPref,
1004 enterprise_connectors::kOnSecurityEventScopePref, chrome_schema));
1005- handlers->AddHandler( 1013- handlers->AddHandler(
1006- std::make_unique< 1014- std::make_unique<
1007- enterprise_connectors::EnterpriseConnectorsPolicyHandler>( 1015- enterprise_connectors::EnterpriseConnectorsPolicyHandler>(
@@ -1009,55 +1017,56 @@
1009- prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode, 1017- prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode,
1010- prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope, chrome_schema)); 1018- prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope, chrome_schema));
1011 1019
1012 handlers->AddHandler(std::make_unique<BrowsingDataLifetimePolicyHandler>( 1020 handlers->AddHandler(
1013 key::kClearBrowsingDataOnExitList, 1021 std::make_unique<ManagedAccountRestrictionsPolicyHandler>(chrome_schema));
1014@@ -1806,17 +1765,6 @@ std::unique_ptr<ConfigurationPolicyHandl 1022@@ -1959,17 +1920,6 @@ std::unique_ptr<ConfigurationPolicyHandl
1015 signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>( 1023 signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
1016 key::kForceBrowserSignin, prefs::kForceBrowserSignin, 1024 key::kForceBrowserSignin, prefs::kForceBrowserSignin,
1017 base::Value::Type::BOOLEAN)); 1025 base::Value::Type::BOOLEAN));
1018- signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>( 1026- signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
1019- key::kSigninAllowed, 1027- key::kSigninAllowed,
1020-#if defined(OS_ANDROID) 1028-#if BUILDFLAG(IS_ANDROID)
1021- // The new kSigninAllowedOnNextStartup pref is only used on Desktop. 1029- // The new kSigninAllowedOnNextStartup pref is only used on Desktop.
1022- // Keep the old kSigninAllowed pref for Android until the policy is 1030- // Keep the old kSigninAllowed pref for Android until the policy is
1023- // fully deprecated in M71 and can be removed. 1031- // fully deprecated in M71 and can be removed.
1024- prefs::kSigninAllowed, 1032- prefs::kSigninAllowed,
1025-#else // defined(OS_ANDROID) 1033-#else // BUILDFLAG(IS_ANDROID)
1026- prefs::kSigninAllowedOnNextStartup, 1034- prefs::kSigninAllowedOnNextStartup,
1027-#endif // defined(OS_ANDROID) 1035-#endif // BUILDFLAG(IS_ANDROID)
1028- base::Value::Type::BOOLEAN)); 1036- base::Value::Type::BOOLEAN));
1029 handlers->AddHandler(std::make_unique<LegacyPoliciesDeprecatingPolicyHandler>( 1037 handlers->AddHandler(std::make_unique<LegacyPoliciesDeprecatingPolicyHandler>(
1030 std::move(signin_legacy_policies), 1038 std::move(signin_legacy_policies),
1031 std::make_unique<BrowserSigninPolicyHandler>(chrome_schema))); 1039 std::make_unique<BrowserSigninPolicyHandler>(chrome_schema)));
1032--- chrome/browser/prefs/browser_prefs.cc.orig 1040--- a/chrome/browser/prefs/browser_prefs.cc
1033+++ chrome/browser/prefs/browser_prefs.cc 1041+++ b/chrome/browser/prefs/browser_prefs.cc
1034@@ -139,7 +139,6 @@ 1042@@ -134,7 +134,6 @@
1035 #include "components/prefs/pref_service.h"
1036 #include "components/privacy_sandbox/privacy_sandbox_prefs.h" 1043 #include "components/privacy_sandbox/privacy_sandbox_prefs.h"
1037 #include "components/proxy_config/pref_proxy_config_tracker_impl.h" 1044 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
1045 #include "components/safe_browsing/content/common/file_type_policies_prefs.h"
1038-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 1046-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
1039 #include "components/search_engines/template_url_prepopulate_data.h" 1047 #include "components/search_engines/template_url_prepopulate_data.h"
1040 #include "components/security_interstitials/content/insecure_form_blocking_page.h" 1048 #include "components/security_interstitials/content/insecure_form_blocking_page.h"
1041 #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" 1049 #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
1042@@ -921,7 +920,6 @@ void RegisterLocalState(PrefRegistrySimp 1050@@ -1014,7 +1013,6 @@ void RegisterLocalState(PrefRegistrySimp
1043 ProfileNetworkContextService::RegisterLocalStatePrefs(registry); 1051 ProfileNetworkContextService::RegisterLocalStatePrefs(registry);
1044 profiles::RegisterPrefs(registry); 1052 profiles::RegisterPrefs(registry);
1045 RegisterScreenshotPrefs(registry); 1053 RegisterScreenshotPrefs(registry);
1046- safe_browsing::RegisterLocalStatePrefs(registry); 1054- safe_browsing::RegisterLocalStatePrefs(registry);
1047 secure_origin_allowlist::RegisterPrefs(registry); 1055 secure_origin_allowlist::RegisterPrefs(registry);
1048 #if !defined(OS_ANDROID) 1056 #if !BUILDFLAG(IS_ANDROID)
1049 SerialPolicyAllowedPorts::RegisterPrefs(registry); 1057 SerialPolicyAllowedPorts::RegisterPrefs(registry);
1050@@ -1171,7 +1169,6 @@ void RegisterProfilePrefs(user_prefs::Pr 1058@@ -1275,8 +1273,6 @@ void RegisterProfilePrefs(user_prefs::Pr
1051 PushMessagingAppIdentifier::RegisterProfilePrefs(registry); 1059 PushMessagingAppIdentifier::RegisterProfilePrefs(registry);
1052 QuietNotificationPermissionUiState::RegisterProfilePrefs(registry); 1060 QuietNotificationPermissionUiState::RegisterProfilePrefs(registry);
1053 RegisterBrowserUserPrefs(registry); 1061 RegisterBrowserUserPrefs(registry);
1062- safe_browsing::file_type::RegisterProfilePrefs(registry);
1054- safe_browsing::RegisterProfilePrefs(registry); 1063- safe_browsing::RegisterProfilePrefs(registry);
1055 SearchPrefetchService::RegisterProfilePrefs(registry); 1064 SearchPrefetchService::RegisterProfilePrefs(registry);
1056 blocked_content::SafeBrowsingTriggeredPopupBlocker::RegisterProfilePrefs( 1065 blocked_content::SafeBrowsingTriggeredPopupBlocker::RegisterProfilePrefs(
1057 registry); 1066 registry);
1058--- chrome/browser/prefs/chrome_command_line_pref_store.cc.orig 1067--- a/chrome/browser/prefs/chrome_command_line_pref_store.cc
1059+++ chrome/browser/prefs/chrome_command_line_pref_store.cc 1068+++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc
1060@@ -31,7 +31,6 @@ 1069@@ -25,7 +25,6 @@
1061 #include "components/language/core/browser/pref_names.h" 1070 #include "components/language/core/browser/pref_names.h"
1062 #include "components/proxy_config/proxy_config_dictionary.h" 1071 #include "components/proxy_config/proxy_config_dictionary.h"
1063 #include "components/proxy_config/proxy_config_pref_names.h" 1072 #include "components/proxy_config/proxy_config_pref_names.h"
@@ -1065,18 +1074,18 @@
1065 #include "components/safe_browsing/core/common/safebrowsing_switches.h" 1074 #include "components/safe_browsing/core/common/safebrowsing_switches.h"
1066 #include "components/sync/base/pref_names.h" 1075 #include "components/sync/base/pref_names.h"
1067 #include "content/public/common/content_switches.h" 1076 #include "content/public/common/content_switches.h"
1068@@ -78,8 +77,6 @@ const CommandLinePrefStore::BooleanSwitc 1077@@ -75,8 +74,6 @@ const CommandLinePrefStore::BooleanSwitc
1069 {switches::kAllowCrossOriginAuthPrompt, 1078 {switches::kAllowCrossOriginAuthPrompt,
1070 prefs::kAllowCrossOriginAuthPrompt, true}, 1079 prefs::kAllowCrossOriginAuthPrompt, true},
1071 {switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true}, 1080 {switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true},
1072- {safe_browsing::switches::kSbEnableEnhancedProtection, 1081- {safe_browsing::switches::kSbEnableEnhancedProtection,
1073- prefs::kSafeBrowsingEnhanced, true}, 1082- prefs::kSafeBrowsingEnhanced, true},
1074 #if BUILDFLAG(IS_CHROMEOS_ASH) 1083 #if BUILDFLAG(IS_CHROMEOS_ASH)
1075 {chromeos::switches::kEnableTouchpadThreeFingerClick, 1084 {ash::switches::kEnableTouchpadThreeFingerClick,
1076 prefs::kEnableTouchpadThreeFingerClick, true}, 1085 prefs::kEnableTouchpadThreeFingerClick, true},
1077--- chrome/browser/prefs/chrome_pref_service_factory.cc.orig 1086--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
1078+++ chrome/browser/prefs/chrome_pref_service_factory.cc 1087+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
1079@@ -48,10 +48,8 @@ 1088@@ -49,10 +49,8 @@
1080 #include "components/prefs/pref_service.h" 1089 #include "components/prefs/pref_service.h"
1081 #include "components/prefs/pref_store.h" 1090 #include "components/prefs/pref_store.h"
1082 #include "components/prefs/pref_value_store.h" 1091 #include "components/prefs/pref_value_store.h"
@@ -1087,7 +1096,7 @@
1087 #include "components/sync/base/model_type.h" 1096 #include "components/sync/base/model_type.h"
1088 #include "components/sync/base/pref_names.h" 1097 #include "components/sync/base/pref_names.h"
1089 #include "components/sync_preferences/pref_model_associator.h" 1098 #include "components/sync_preferences/pref_model_associator.h"
1090@@ -121,8 +119,6 @@ const prefs::TrackedPreferenceMetadata k 1099@@ -122,8 +120,6 @@ const prefs::TrackedPreferenceMetadata k
1091 {5, extensions::pref_names::kExtensions, EnforcementLevel::NO_ENFORCEMENT, 1100 {5, extensions::pref_names::kExtensions, EnforcementLevel::NO_ENFORCEMENT,
1092 PrefTrackingStrategy::SPLIT, ValueType::IMPERSONAL}, 1101 PrefTrackingStrategy::SPLIT, ValueType::IMPERSONAL},
1093 #endif 1102 #endif
@@ -1095,17 +1104,17 @@
1095- PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL}, 1104- PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL},
1096 {7, prefs::kSearchProviderOverrides, EnforcementLevel::ENFORCE_ON_LOAD, 1105 {7, prefs::kSearchProviderOverrides, EnforcementLevel::ENFORCE_ON_LOAD,
1097 PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, 1106 PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
1098 #if !defined(OS_ANDROID) 1107 #if !BUILDFLAG(IS_ANDROID)
1099@@ -146,8 +142,6 @@ const prefs::TrackedPreferenceMetadata k 1108@@ -147,8 +143,6 @@ const prefs::TrackedPreferenceMetadata k
1100 PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, 1109 PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
1101 // kSyncRemainingRollbackTries is deprecated and will be removed a few 1110 // kSyncRemainingRollbackTries is deprecated and will be removed a few
1102 // releases after M50. 1111 // releases after M50.
1103- {18, prefs::kSafeBrowsingIncidentsSent, EnforcementLevel::ENFORCE_ON_LOAD, 1112- {18, prefs::kSafeBrowsingIncidentsSent, EnforcementLevel::ENFORCE_ON_LOAD,
1104- PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, 1113- PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
1105 #if defined(OS_WIN) 1114 #if BUILDFLAG(IS_WIN)
1106 {19, prefs::kSwReporterPromptVersion, EnforcementLevel::ENFORCE_ON_LOAD, 1115 {19, prefs::kSwReporterPromptVersion, EnforcementLevel::ENFORCE_ON_LOAD,
1107 PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, 1116 PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
1108@@ -156,10 +150,6 @@ const prefs::TrackedPreferenceMetadata k 1117@@ -157,10 +151,6 @@ const prefs::TrackedPreferenceMetadata k
1109 {22, prefs::kSwReporterPromptSeed, EnforcementLevel::ENFORCE_ON_LOAD, 1118 {22, prefs::kSwReporterPromptSeed, EnforcementLevel::ENFORCE_ON_LOAD,
1110 PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, 1119 PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
1111 #endif 1120 #endif
@@ -1113,11 +1122,11 @@
1113- PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL}, 1122- PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL},
1114- {24, prefs::kGoogleServicesLastAccountId, EnforcementLevel::ENFORCE_ON_LOAD, 1123- {24, prefs::kGoogleServicesLastAccountId, EnforcementLevel::ENFORCE_ON_LOAD,
1115- PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL}, 1124- PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL},
1116 #if defined(OS_WIN) 1125 #if BUILDFLAG(IS_WIN)
1117 {25, prefs::kSettingsResetPromptPromptWave, 1126 {25, prefs::kSettingsResetPromptPromptWave,
1118 EnforcementLevel::ENFORCE_ON_LOAD, PrefTrackingStrategy::ATOMIC, 1127 EnforcementLevel::ENFORCE_ON_LOAD, PrefTrackingStrategy::ATOMIC,
1119--- chrome/browser/prefs/pref_functional_browsertest.cc.orig 1128--- a/chrome/browser/prefs/pref_functional_browsertest.cc
1120+++ chrome/browser/prefs/pref_functional_browsertest.cc 1129+++ b/chrome/browser/prefs/pref_functional_browsertest.cc
1121@@ -24,7 +24,6 @@ 1130@@ -24,7 +24,6 @@
1122 #include "components/content_settings/core/common/content_settings_types.h" 1131 #include "components/content_settings/core/common/content_settings_types.h"
1123 #include "components/content_settings/core/common/pref_names.h" 1132 #include "components/content_settings/core/common/pref_names.h"
@@ -1127,8 +1136,8 @@
1127 #include "content/public/browser/web_contents.h" 1136 #include "content/public/browser/web_contents.h"
1128 #include "content/public/test/browser_test.h" 1137 #include "content/public/test/browser_test.h"
1129@@ -220,9 +219,6 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTe 1138@@ -220,9 +219,6 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTe
1130 prefs->SetInteger(prefs::kNetworkPredictionOptions, 1139 prefetch::SetPreloadPagesState(prefs,
1131 chrome_browser_net::NETWORK_PREDICTION_NEVER); 1140 prefetch::PreloadPagesState::kNoPreloading);
1132 1141
1133- EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled)); 1142- EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
1134- prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false); 1143- prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false);
@@ -1138,25 +1147,25 @@
1138 1147
1139@@ -236,7 +232,6 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTe 1148@@ -236,7 +232,6 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTe
1140 1149
1141 EXPECT_EQ(chrome_browser_net::NETWORK_PREDICTION_NEVER, 1150 EXPECT_EQ(prefetch::PreloadPagesState::kNoPreloading,
1142 prefs->GetInteger(prefs::kNetworkPredictionOptions)); 1151 prefetch::GetPreloadPagesState(*prefs));
1143- EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled)); 1152- EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
1144 EXPECT_FALSE( 1153 EXPECT_FALSE(
1145 prefs->GetBoolean(embedder_support::kAlternateErrorPagesEnabled)); 1154 prefs->GetBoolean(embedder_support::kAlternateErrorPagesEnabled));
1146 EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); 1155 EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
1147--- chrome/browser/profiles/gaia_info_update_service.cc.orig 1156--- a/chrome/browser/profiles/gaia_info_update_service.cc
1148+++ chrome/browser/profiles/gaia_info_update_service.cc 1157+++ b/chrome/browser/profiles/gaia_info_update_service.cc
1149@@ -19,7 +19,6 @@ 1158@@ -20,7 +20,6 @@
1150 #include "chrome/common/pref_names.h"
1151 #include "components/prefs/pref_service.h" 1159 #include "components/prefs/pref_service.h"
1152 #include "components/signin/public/base/avatar_icon_util.h" 1160 #include "components/signin/public/base/avatar_icon_util.h"
1161 #include "components/signin/public/base/consent_level.h"
1153-#include "components/signin/public/base/signin_pref_names.h" 1162-#include "components/signin/public/base/signin_pref_names.h"
1154 #include "components/signin/public/identity_manager/account_info.h" 1163 #include "components/signin/public/identity_manager/account_info.h"
1155 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" 1164 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
1156 #include "components/signin/public/identity_manager/consent_level.h" 1165 #include "content/public/browser/notification_details.h"
1157--- chrome/browser/profiles/gaia_info_update_service_unittest.cc.orig 1166--- a/chrome/browser/profiles/gaia_info_update_service_unittest.cc
1158+++ chrome/browser/profiles/gaia_info_update_service_unittest.cc 1167+++ b/chrome/browser/profiles/gaia_info_update_service_unittest.cc
1159@@ -27,7 +27,6 @@ 1168@@ -28,7 +28,6 @@
1160 #include "chrome/test/base/testing_profile_manager.h" 1169 #include "chrome/test/base/testing_profile_manager.h"
1161 #include "components/prefs/pref_service.h" 1170 #include "components/prefs/pref_service.h"
1162 #include "components/profile_metrics/state.h" 1171 #include "components/profile_metrics/state.h"
@@ -1164,9 +1173,9 @@
1164 #include "components/signin/public/identity_manager/account_info.h" 1173 #include "components/signin/public/identity_manager/account_info.h"
1165 #include "components/sync_preferences/pref_service_syncable.h" 1174 #include "components/sync_preferences/pref_service_syncable.h"
1166 #include "content/public/test/browser_task_environment.h" 1175 #include "content/public/test/browser_task_environment.h"
1167--- chrome/browser/profiles/profile_attributes_entry.cc.orig 1176--- a/chrome/browser/profiles/profile_attributes_entry.cc
1168+++ chrome/browser/profiles/profile_attributes_entry.cc 1177+++ b/chrome/browser/profiles/profile_attributes_entry.cc
1169@@ -29,7 +29,6 @@ 1178@@ -26,7 +26,6 @@
1170 #include "components/prefs/pref_service.h" 1179 #include "components/prefs/pref_service.h"
1171 #include "components/prefs/scoped_user_pref_update.h" 1180 #include "components/prefs/scoped_user_pref_update.h"
1172 #include "components/profile_metrics/state.h" 1181 #include "components/profile_metrics/state.h"
@@ -1174,7 +1183,7 @@
1174 #include "components/signin/public/identity_manager/account_info.h" 1183 #include "components/signin/public/identity_manager/account_info.h"
1175 #include "third_party/abseil-cpp/absl/types/optional.h" 1184 #include "third_party/abseil-cpp/absl/types/optional.h"
1176 #include "ui/base/resource/resource_bundle.h" 1185 #include "ui/base/resource/resource_bundle.h"
1177@@ -490,7 +489,7 @@ bool ProfileAttributesEntry::IsUsingDefa 1186@@ -486,7 +485,7 @@ bool ProfileAttributesEntry::IsUsingDefa
1178 } 1187 }
1179 1188
1180 bool ProfileAttributesEntry::IsSignedInWithCredentialProvider() const { 1189 bool ProfileAttributesEntry::IsSignedInWithCredentialProvider() const {
@@ -1183,7 +1192,7 @@
1183 } 1192 }
1184 1193
1185 size_t ProfileAttributesEntry::GetAvatarIconIndex() const { 1194 size_t ProfileAttributesEntry::GetAvatarIconIndex() const {
1186@@ -672,9 +671,6 @@ void ProfileAttributesEntry::SetLastDown 1195@@ -666,9 +665,6 @@ void ProfileAttributesEntry::SetLastDown
1187 } 1196 }
1188 1197
1189 void ProfileAttributesEntry::SetSignedInWithCredentialProvider(bool value) { 1198 void ProfileAttributesEntry::SetSignedInWithCredentialProvider(bool value) {
@@ -1193,9 +1202,9 @@
1193 } 1202 }
1194 1203
1195 void ProfileAttributesEntry::LockForceSigninProfile(bool is_lock) { 1204 void ProfileAttributesEntry::LockForceSigninProfile(bool is_lock) {
1196--- chrome/browser/profiles/profile_attributes_storage.cc.orig 1205--- a/chrome/browser/profiles/profile_attributes_storage.cc
1197+++ chrome/browser/profiles/profile_attributes_storage.cc 1206+++ b/chrome/browser/profiles/profile_attributes_storage.cc
1198@@ -36,7 +36,6 @@ 1207@@ -38,7 +38,6 @@
1199 #include "components/prefs/scoped_user_pref_update.h" 1208 #include "components/prefs/scoped_user_pref_update.h"
1200 #include "components/profile_metrics/state.h" 1209 #include "components/profile_metrics/state.h"
1201 #include "components/signin/public/base/persistent_repeating_timer.h" 1210 #include "components/signin/public/base/persistent_repeating_timer.h"
@@ -1203,7 +1212,7 @@
1203 #include "content/public/browser/browser_task_traits.h" 1212 #include "content/public/browser/browser_task_traits.h"
1204 #include "content/public/browser/browser_thread.h" 1213 #include "content/public/browser/browser_thread.h"
1205 #include "third_party/icu/source/i18n/unicode/coll.h" 1214 #include "third_party/icu/source/i18n/unicode/coll.h"
1206@@ -374,8 +373,6 @@ void ProfileAttributesStorage::AddProfil 1215@@ -376,8 +375,6 @@ void ProfileAttributesStorage::AddProfil
1207 if (params.account_id.HasAccountIdKey()) 1216 if (params.account_id.HasAccountIdKey())
1208 info.SetStringKey(ProfileAttributesEntry::kAccountIdKey, 1217 info.SetStringKey(ProfileAttributesEntry::kAccountIdKey,
1209 params.account_id.GetAccountIdKey()); 1218 params.account_id.GetAccountIdKey());
@@ -1212,9 +1221,9 @@
1212 attributes->SetKey(key, std::move(info)); 1221 attributes->SetKey(key, std::move(info));
1213 1222
1214 ProfileAttributesEntry* entry = InitEntryWithKey(key, params.is_omitted); 1223 ProfileAttributesEntry* entry = InitEntryWithKey(key, params.is_omitted);
1215--- chrome/browser/profiles/profile_impl.cc.orig 1224--- a/chrome/browser/profiles/profile_impl.cc
1216+++ chrome/browser/profiles/profile_impl.cc 1225+++ b/chrome/browser/profiles/profile_impl.cc
1217@@ -150,7 +150,6 @@ 1226@@ -149,7 +149,6 @@
1218 #include "components/prefs/scoped_user_pref_update.h" 1227 #include "components/prefs/scoped_user_pref_update.h"
1219 #include "components/profile_metrics/browser_profile_type.h" 1228 #include "components/profile_metrics/browser_profile_type.h"
1220 #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" 1229 #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
@@ -1222,17 +1231,17 @@
1222 #include "components/signin/public/identity_manager/identity_manager.h" 1231 #include "components/signin/public/identity_manager/identity_manager.h"
1223 #include "components/site_isolation/site_isolation_policy.h" 1232 #include "components/site_isolation/site_isolation_policy.h"
1224 #include "components/spellcheck/spellcheck_buildflags.h" 1233 #include "components/spellcheck/spellcheck_buildflags.h"
1225--- chrome/browser/profiles/profile_manager.cc.orig 1234--- a/chrome/browser/profiles/profile_manager.cc
1226+++ chrome/browser/profiles/profile_manager.cc 1235+++ b/chrome/browser/profiles/profile_manager.cc
1227@@ -94,7 +94,6 @@ 1236@@ -93,7 +93,6 @@
1228 #include "components/search_engines/default_search_manager.h" 1237 #include "components/signin/public/base/consent_level.h"
1229 #include "components/signin/public/base/signin_buildflags.h" 1238 #include "components/signin/public/base/signin_buildflags.h"
1230 #include "components/signin/public/base/signin_metrics.h" 1239 #include "components/signin/public/base/signin_metrics.h"
1231-#include "components/signin/public/base/signin_pref_names.h" 1240-#include "components/signin/public/base/signin_pref_names.h"
1232 #include "components/signin/public/identity_manager/consent_level.h"
1233 #include "components/signin/public/identity_manager/identity_manager.h" 1241 #include "components/signin/public/identity_manager/identity_manager.h"
1234 #include "components/signin/public/identity_manager/primary_account_mutator.h" 1242 #include "components/signin/public/identity_manager/primary_account_mutator.h"
1235@@ -2105,8 +2104,7 @@ void ProfileManager::AddProfileToStorage 1243 #include "components/sync/base/stop_source.h"
1244@@ -2228,8 +2227,7 @@ void ProfileManager::AddProfileToStorage
1236 entry->SetAuthInfo(account_info.gaia, username, 1245 entry->SetAuthInfo(account_info.gaia, username,
1237 is_consented_primary_account); 1246 is_consented_primary_account);
1238 1247
@@ -1240,9 +1249,9 @@
1240- prefs::kSignedInWithCredentialProvider)); 1249- prefs::kSignedInWithCredentialProvider));
1241+ entry->SetSignedInWithCredentialProvider(false); 1250+ entry->SetSignedInWithCredentialProvider(false);
1242 1251
1243 #if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) 1252 #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
1244 // Sign out if force-sign-in policy is enabled and profile is not signed 1253 // Sign out if force-sign-in policy is enabled and profile is not signed
1245@@ -2161,14 +2159,13 @@ void ProfileManager::AddProfileToStorage 1254@@ -2284,14 +2282,13 @@ void ProfileManager::AddProfileToStorage
1246 1255
1247 init_params.is_ephemeral = IsEphemeral(profile); 1256 init_params.is_ephemeral = IsEphemeral(profile);
1248 init_params.is_signed_in_with_credential_provider = 1257 init_params.is_signed_in_with_credential_provider =
@@ -1258,9 +1267,9 @@
1258 prefs->SetBoolean(bookmarks::prefs::kEditBookmarksEnabled, false); 1267 prefs->SetBoolean(bookmarks::prefs::kEditBookmarksEnabled, false);
1259 prefs->SetBoolean(bookmarks::prefs::kShowBookmarkBar, false); 1268 prefs->SetBoolean(bookmarks::prefs::kShowBookmarkBar, false);
1260 prefs->ClearPref(DefaultSearchManager::kDefaultSearchProviderDataPrefName); 1269 prefs->ClearPref(DefaultSearchManager::kDefaultSearchProviderDataPrefName);
1261--- chrome/browser/profiles/profile_window.cc.orig 1270--- a/chrome/browser/profiles/profile_window.cc
1262+++ chrome/browser/profiles/profile_window.cc 1271+++ b/chrome/browser/profiles/profile_window.cc
1263@@ -40,7 +40,6 @@ 1272@@ -41,7 +41,6 @@
1264 #include "chrome/common/url_constants.h" 1273 #include "chrome/common/url_constants.h"
1265 #include "components/flags_ui/pref_service_flags_storage.h" 1274 #include "components/flags_ui/pref_service_flags_storage.h"
1266 #include "components/prefs/pref_service.h" 1275 #include "components/prefs/pref_service.h"
@@ -1268,8 +1277,8 @@
1268 #include "components/signin/public/identity_manager/account_info.h" 1277 #include "components/signin/public/identity_manager/account_info.h"
1269 #include "components/signin/public/identity_manager/identity_manager.h" 1278 #include "components/signin/public/identity_manager/identity_manager.h"
1270 #include "content/public/browser/browser_thread.h" 1279 #include "content/public/browser/browser_thread.h"
1271--- chrome/browser/profiles/profiles_state.cc.orig 1280--- a/chrome/browser/profiles/profiles_state.cc
1272+++ chrome/browser/profiles/profiles_state.cc 1281+++ b/chrome/browser/profiles/profiles_state.cc
1273@@ -42,7 +42,6 @@ 1282@@ -42,7 +42,6 @@
1274 #include <algorithm> 1283 #include <algorithm>
1275 #include "chrome/browser/profiles/gaia_info_update_service.h" 1284 #include "chrome/browser/profiles/gaia_info_update_service.h"
@@ -1278,24 +1287,24 @@
1278 #endif 1287 #endif
1279 1288
1280 #if BUILDFLAG(IS_CHROMEOS_LACROS) 1289 #if BUILDFLAG(IS_CHROMEOS_LACROS)
1281--- chrome/browser/resources/settings/privacy_page/disable_safebrowsing_dialog.html.orig 1290--- a/chrome/browser/resources/settings/privacy_page/disable_safebrowsing_dialog.html
1282+++ chrome/browser/resources/settings/privacy_page/disable_safebrowsing_dialog.html 1291+++ b/chrome/browser/resources/settings/privacy_page/disable_safebrowsing_dialog.html
1283@@ -1,12 +1,9 @@ 1292@@ -1,12 +1,9 @@
1284 <cr-dialog id="dialog" close-text="$i18n{close}"> 1293 <cr-dialog id="dialog" close-text="$i18n{close}">
1285- <div slot="title">$i18n{safeBrowsingDisableDialog}</div> 1294- <div slot="title">$i18n{safeBrowsingDisableDialog}</div>
1286- <div slot="body">$i18n{safeBrowsingDisableDialogDesc}</div> 1295- <div slot="body">$i18n{safeBrowsingDisableDialogDesc}</div>
1287 <div slot="button-container"> 1296 <div slot="button-container">
1288 <cr-button class="cancel-button" on-click="onDialogCancel_"> 1297 <cr-button id="cancel" class="cancel-button" on-click="onDialogCancel_">
1289 $i18n{cancel} 1298 $i18n{cancel}
1290 </cr-button> 1299 </cr-button>
1291 <cr-button class="action-button" on-click="onDialogConfirm_"> 1300 <cr-button id="confirm" class="action-button" on-click="onDialogConfirm_">
1292- $i18n{safeBrowsingDisableDialogConfirm} 1301- $i18n{safeBrowsingDisableDialogConfirm}
1293 </cr-button> 1302 </cr-button>
1294 </div> 1303 </div>
1295 </cr-dialog> 1304 </cr-dialog>
1296--- chrome/browser/resources/settings/privacy_page/privacy_page.html.orig 1305--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
1297+++ chrome/browser/resources/settings/privacy_page/privacy_page.html 1306+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
1298@@ -535,7 +535,7 @@ 1307@@ -565,7 +565,7 @@
1299 </category-setting-exceptions> 1308 </category-setting-exceptions>
1300 </settings-subpage> 1309 </settings-subpage>
1301 </template> 1310 </template>
@@ -1304,9 +1313,9 @@
1304 no-search> 1313 no-search>
1305 <template is="dom-if" route-path="/content/ads" no-search> 1314 <template is="dom-if" route-path="/content/ads" no-search>
1306 <settings-subpage page-title="$i18n{siteSettingsAds}" 1315 <settings-subpage page-title="$i18n{siteSettingsAds}"
1307--- chrome/browser/resources/settings/privacy_page/privacy_page.ts.orig 1316--- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
1308+++ chrome/browser/resources/settings/privacy_page/privacy_page.ts 1317+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
1309@@ -90,7 +90,7 @@ export class SettingsPrivacyPageElement 1318@@ -102,7 +102,7 @@ export class SettingsPrivacyPageElement
1310 enableSafeBrowsingSubresourceFilter_: { 1319 enableSafeBrowsingSubresourceFilter_: {
1311 type: Boolean, 1320 type: Boolean,
1312 value() { 1321 value() {
@@ -1315,8 +1324,8 @@
1315 } 1324 }
1316 }, 1325 },
1317 1326
1318--- chrome/browser/resources/settings/privacy_page/security_page.html.orig 1327--- a/chrome/browser/resources/settings/privacy_page/security_page.html
1319+++ chrome/browser/resources/settings/privacy_page/security_page.html 1328+++ b/chrome/browser/resources/settings/privacy_page/security_page.html
1320@@ -53,105 +53,6 @@ 1329@@ -53,105 +53,6 @@
1321 <img id="banner" alt="" 1330 <img id="banner" alt=""
1322 src="chrome://settings/images/safe_browsing_banner.svg"> 1331 src="chrome://settings/images/safe_browsing_banner.svg">
@@ -1423,7 +1432,7 @@
1423 <div class="cr-row first"> 1432 <div class="cr-row first">
1424 <h2>$i18n{advancedPageTitle}</h2> 1433 <h2>$i18n{advancedPageTitle}</h2>
1425 </div> 1434 </div>
1426@@ -202,8 +103,3 @@ 1435@@ -213,8 +114,3 @@
1427 on-click="onAdvancedProtectionProgramLinkClick_" 1436 on-click="onAdvancedProtectionProgramLinkClick_"
1428 external> 1437 external>
1429 </cr-link-row> 1438 </cr-link-row>
@@ -1432,25 +1441,27 @@
1432- on-close="onDisableSafebrowsingDialogClose_"> 1441- on-close="onDisableSafebrowsingDialogClose_">
1433- </settings-disable-safebrowsing-dialog> 1442- </settings-disable-safebrowsing-dialog>
1434- </template> 1443- </template>
1435--- chrome/browser/resources/settings/privacy_page/security_page.ts.orig 1444--- a/chrome/browser/resources/settings/privacy_page/security_page.ts
1436+++ chrome/browser/resources/settings/privacy_page/security_page.ts 1445+++ b/chrome/browser/resources/settings/privacy_page/security_page.ts
1437@@ -182,15 +182,6 @@ export class SettingsSecurityPageElement 1446@@ -200,17 +200,6 @@ export class SettingsSecurityPageElement
1438 1447
1439 ready() { 1448 override ready() {
1440 super.ready(); 1449 super.ready();
1441- 1450-
1442- // Expand initial pref value manually because automatic 1451- CrSettingsPrefs.initialized.then(() => {
1443- // expanding is disabled. 1452- // Expand initial pref value manually because automatic
1444- const prefValue = this.getPref('generated.safe_browsing').value; 1453- // expanding is disabled.
1445- if (prefValue === SafeBrowsingSetting.ENHANCED) { 1454- const prefValue = this.getPref('generated.safe_browsing').value;
1446- this.$.safeBrowsingEnhanced.expanded = true; 1455- if (prefValue === SafeBrowsingSetting.ENHANCED) {
1447- } else if (prefValue === SafeBrowsingSetting.STANDARD) { 1456- this.$.safeBrowsingEnhanced.expanded = true;
1448- this.$.safeBrowsingStandard.expanded = true; 1457- } else if (prefValue === SafeBrowsingSetting.STANDARD) {
1449- } 1458- this.$.safeBrowsingStandard.expanded = true;
1459- }
1460- });
1450 } 1461 }
1451 1462
1452 /** 1463 /**
1453@@ -239,8 +230,7 @@ export class SettingsSecurityPageElement 1464@@ -259,8 +248,7 @@ export class SettingsSecurityPageElement
1454 } 1465 }
1455 1466
1456 private getDisabledExtendedSafeBrowsing_(): boolean { 1467 private getDisabledExtendedSafeBrowsing_(): boolean {
@@ -1460,9 +1471,9 @@
1460 } 1471 }
1461 1472
1462 private getPasswordsLeakToggleSubLabel_(): string { 1473 private getPasswordsLeakToggleSubLabel_(): string {
1463--- chrome/browser/resources/settings/site_settings_page/site_settings_page.ts.orig 1474--- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
1464+++ chrome/browser/resources/settings/site_settings_page/site_settings_page.ts 1475+++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
1465@@ -47,7 +47,7 @@ function getCategoryItemMap(): Map<Conte 1476@@ -48,7 +48,7 @@ function getCategoryItemMap(): Map<Conte
1466 enabledLabel: 'siteSettingsAdsAllowed', 1477 enabledLabel: 'siteSettingsAdsAllowed',
1467 disabledLabel: 'siteSettingsAdsBlocked', 1478 disabledLabel: 'siteSettingsAdsBlocked',
1468 shouldShow: () => 1479 shouldShow: () =>
@@ -1471,8 +1482,8 @@
1471 }, 1482 },
1472 { 1483 {
1473 route: routes.SITE_SETTINGS_AR, 1484 route: routes.SITE_SETTINGS_AR,
1474--- chrome/browser/safe_browsing/ad_redirect_trigger_browsertest.cc.orig 1485--- a/chrome/browser/safe_browsing/ad_redirect_trigger_browsertest.cc
1475+++ chrome/browser/safe_browsing/ad_redirect_trigger_browsertest.cc 1486+++ b/chrome/browser/safe_browsing/ad_redirect_trigger_browsertest.cc
1476@@ -19,7 +19,6 @@ 1487@@ -19,7 +19,6 @@
1477 #include "components/prefs/testing_pref_service.h" 1488 #include "components/prefs/testing_pref_service.h"
1478 #include "components/safe_browsing/content/browser/triggers/ad_redirect_trigger.h" 1489 #include "components/safe_browsing/content/browser/triggers/ad_redirect_trigger.h"
@@ -1481,16 +1492,16 @@
1481 #include "content/public/browser/render_frame_host.h" 1492 #include "content/public/browser/render_frame_host.h"
1482 #include "content/public/browser/web_contents.h" 1493 #include "content/public/browser/web_contents.h"
1483 #include "content/public/test/browser_test.h" 1494 #include "content/public/test/browser_test.h"
1484--- chrome/browser/safe_browsing/advanced_protection_status_manager.cc.orig 1495--- a/chrome/browser/safe_browsing/advanced_protection_status_manager.cc
1485+++ chrome/browser/safe_browsing/advanced_protection_status_manager.cc 1496+++ b/chrome/browser/safe_browsing/advanced_protection_status_manager.cc
1486@@ -13,7 +13,6 @@ 1497@@ -13,7 +13,6 @@
1487 #include "chrome/browser/signin/identity_manager_factory.h" 1498 #include "chrome/browser/signin/identity_manager_factory.h"
1488 #include "components/prefs/pref_service.h" 1499 #include "components/prefs/pref_service.h"
1489 #include "components/safe_browsing/core/common/features.h" 1500 #include "components/safe_browsing/core/common/features.h"
1490-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 1501-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
1502 #include "components/signin/public/base/consent_level.h"
1491 #include "components/signin/public/identity_manager/account_info.h" 1503 #include "components/signin/public/identity_manager/account_info.h"
1492 #include "components/signin/public/identity_manager/accounts_mutator.h" 1504 #include "components/signin/public/identity_manager/accounts_mutator.h"
1493 #include "components/signin/public/identity_manager/consent_level.h"
1494@@ -63,9 +62,7 @@ void AdvancedProtectionStatusManager::Ma 1505@@ -63,9 +62,7 @@ void AdvancedProtectionStatusManager::Ma
1495 1506
1496 is_under_advanced_protection_ = core_info.is_under_advanced_protection; 1507 is_under_advanced_protection_ = core_info.is_under_advanced_protection;
@@ -1524,8 +1535,8 @@
1524 } 1535 }
1525 1536
1526 bool AdvancedProtectionStatusManager::IsUnconsentedPrimaryAccount( 1537 bool AdvancedProtectionStatusManager::IsUnconsentedPrimaryAccount(
1527--- chrome/browser/safe_browsing/advanced_protection_status_manager_unittest.cc.orig 1538--- a/chrome/browser/safe_browsing/advanced_protection_status_manager_unittest.cc
1528+++ chrome/browser/safe_browsing/advanced_protection_status_manager_unittest.cc 1539+++ b/chrome/browser/safe_browsing/advanced_protection_status_manager_unittest.cc
1529@@ -10,7 +10,6 @@ 1540@@ -10,7 +10,6 @@
1530 #include "base/test/task_environment.h" 1541 #include "base/test/task_environment.h"
1531 #include "build/chromeos_buildflags.h" 1542 #include "build/chromeos_buildflags.h"
@@ -1534,18 +1545,18 @@
1534 #include "components/signin/public/identity_manager/account_info.h" 1545 #include "components/signin/public/identity_manager/account_info.h"
1535 #include "components/signin/public/identity_manager/accounts_mutator.h" 1546 #include "components/signin/public/identity_manager/accounts_mutator.h"
1536 #include "components/signin/public/identity_manager/identity_test_environment.h" 1547 #include "components/signin/public/identity_manager/identity_test_environment.h"
1537--- chrome/browser/safe_browsing/android/services_delegate_android.h.orig 1548--- a/chrome/browser/safe_browsing/android/services_delegate_android.h
1538+++ chrome/browser/safe_browsing/android/services_delegate_android.h 1549+++ b/chrome/browser/safe_browsing/android/services_delegate_android.h
1539@@ -7,7 +7,6 @@ 1550@@ -6,7 +6,6 @@
1551 #define CHROME_BROWSER_SAFE_BROWSING_ANDROID_SERVICES_DELEGATE_ANDROID_H_
1540 1552
1541 #include "base/macros.h"
1542 #include "chrome/browser/safe_browsing/services_delegate.h" 1553 #include "chrome/browser/safe_browsing/services_delegate.h"
1543-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 1554-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
1544 1555
1545 namespace safe_browsing { 1556 namespace safe_browsing {
1546 1557
1547--- chrome/browser/safe_browsing/certificate_reporting_service.cc.orig 1558--- a/chrome/browser/safe_browsing/certificate_reporting_service.cc
1548+++ chrome/browser/safe_browsing/certificate_reporting_service.cc 1559+++ b/chrome/browser/safe_browsing/certificate_reporting_service.cc
1549@@ -14,7 +14,6 @@ 1560@@ -14,7 +14,6 @@
1550 #include "chrome/browser/profiles/profile.h" 1561 #include "chrome/browser/profiles/profile.h"
1551 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 1562 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
@@ -1554,9 +1565,9 @@
1554 #include "components/security_interstitials/content/certificate_error_report.h" 1565 #include "components/security_interstitials/content/certificate_error_report.h"
1555 #include "content/public/browser/browser_thread.h" 1566 #include "content/public/browser/browser_thread.h"
1556 #include "services/network/public/cpp/shared_url_loader_factory.h" 1567 #include "services/network/public/cpp/shared_url_loader_factory.h"
1557--- chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc.orig 1568--- a/chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc
1558+++ chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc 1569+++ b/chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc
1559@@ -27,7 +27,6 @@ 1570@@ -25,7 +25,6 @@
1560 #include "chrome/test/base/in_process_browser_test.h" 1571 #include "chrome/test/base/in_process_browser_test.h"
1561 #include "chrome/test/base/ui_test_utils.h" 1572 #include "chrome/test/base/ui_test_utils.h"
1562 #include "components/prefs/pref_service.h" 1573 #include "components/prefs/pref_service.h"
@@ -1564,8 +1575,8 @@
1564 #include "components/security_interstitials/content/cert_report_helper.h" 1575 #include "components/security_interstitials/content/cert_report_helper.h"
1565 #include "components/security_interstitials/content/certificate_error_report.h" 1576 #include "components/security_interstitials/content/certificate_error_report.h"
1566 #include "components/variations/variations_params_manager.h" 1577 #include "components/variations/variations_params_manager.h"
1567--- chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.cc.orig 1578--- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.cc
1568+++ chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.cc 1579+++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.cc
1569@@ -43,7 +43,6 @@ 1580@@ -43,7 +43,6 @@
1570 #include "components/component_updater/component_updater_service.h" 1581 #include "components/component_updater/component_updater_service.h"
1571 #include "components/component_updater/pref_names.h" 1582 #include "components/component_updater/pref_names.h"
@@ -1574,9 +1585,9 @@
1574 #include "content/public/browser/browser_task_traits.h" 1585 #include "content/public/browser/browser_task_traits.h"
1575 #include "content/public/browser/browser_thread.h" 1586 #include "content/public/browser/browser_thread.h"
1576 #include "net/http/http_status_code.h" 1587 #include "net/http/http_status_code.h"
1577--- chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc.orig 1588--- a/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc
1578+++ chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc 1589+++ b/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc
1579@@ -44,7 +44,6 @@ 1590@@ -43,7 +43,6 @@
1580 #include "components/policy/core/common/mock_configuration_policy_provider.h" 1591 #include "components/policy/core/common/mock_configuration_policy_provider.h"
1581 #include "components/policy/policy_constants.h" 1592 #include "components/policy/policy_constants.h"
1582 #include "components/prefs/pref_service.h" 1593 #include "components/prefs/pref_service.h"
@@ -1584,8 +1595,8 @@
1584 #include "content/public/test/browser_test.h" 1595 #include "content/public/test/browser_test.h"
1585 #include "testing/gmock/include/gmock/gmock.h" 1596 #include "testing/gmock/include/gmock/gmock.h"
1586 #include "testing/gtest/include/gtest/gtest.h" 1597 #include "testing/gtest/include/gtest/gtest.h"
1587--- chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.cc.orig 1598--- a/chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.cc
1588+++ chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.cc 1599+++ b/chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.cc
1589@@ -12,7 +12,6 @@ 1600@@ -12,7 +12,6 @@
1590 #include "chrome/browser/profiles/profile.h" 1601 #include "chrome/browser/profiles/profile.h"
1591 #include "chrome/browser/profiles/profile_manager.h" 1602 #include "chrome/browser/profiles/profile_manager.h"
@@ -1594,9 +1605,9 @@
1594 #include "components/version_info/version_info.h" 1605 #include "components/version_info/version_info.h"
1595 1606
1596 namespace safe_browsing { 1607 namespace safe_browsing {
1597--- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig 1608--- a/chrome/browser/safe_browsing/chrome_password_protection_service.cc
1598+++ chrome/browser/safe_browsing/chrome_password_protection_service.cc 1609+++ b/chrome/browser/safe_browsing/chrome_password_protection_service.cc
1599@@ -63,7 +63,6 @@ 1610@@ -65,7 +65,6 @@
1600 #include "components/safe_browsing/core/browser/verdict_cache_manager.h" 1611 #include "components/safe_browsing/core/browser/verdict_cache_manager.h"
1601 #include "components/safe_browsing/core/common/features.h" 1612 #include "components/safe_browsing/core/common/features.h"
1602 #include "components/safe_browsing/core/common/proto/csd.pb.h" 1613 #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -1604,7 +1615,7 @@
1604 #include "components/safe_browsing/core/common/safebrowsing_constants.h" 1615 #include "components/safe_browsing/core/common/safebrowsing_constants.h"
1605 #include "components/safe_browsing/core/common/utils.h" 1616 #include "components/safe_browsing/core/common/utils.h"
1606 #include "components/security_interstitials/content/unsafe_resource_util.h" 1617 #include "components/security_interstitials/content/unsafe_resource_util.h"
1607@@ -1220,14 +1219,6 @@ bool ChromePasswordProtectionService::Ha 1618@@ -1212,14 +1211,6 @@ bool ChromePasswordProtectionService::Ha
1608 } 1619 }
1609 1620
1610 void ChromePasswordProtectionService::OnWarningTriggerChanged() { 1621 void ChromePasswordProtectionService::OnWarningTriggerChanged() {
@@ -1619,7 +1630,7 @@
1619 // Clears captured enterprise password hashes or GSuite sync password hashes. 1630 // Clears captured enterprise password hashes or GSuite sync password hashes.
1620 password_manager::PasswordReuseManager* reuse_manager = 1631 password_manager::PasswordReuseManager* reuse_manager =
1621 GetPasswordReuseManager(); 1632 GetPasswordReuseManager();
1622@@ -1385,7 +1376,7 @@ PrefService* ChromePasswordProtectionSer 1633@@ -1378,7 +1369,7 @@ PrefService* ChromePasswordProtectionSer
1623 } 1634 }
1624 1635
1625 bool ChromePasswordProtectionService::IsSafeBrowsingEnabled() { 1636 bool ChromePasswordProtectionService::IsSafeBrowsingEnabled() {
@@ -1628,7 +1639,7 @@
1628 } 1639 }
1629 1640
1630 bool ChromePasswordProtectionService::IsExtendedReporting() { 1641 bool ChromePasswordProtectionService::IsExtendedReporting() {
1631@@ -1405,44 +1396,7 @@ bool ChromePasswordProtectionService::Is 1642@@ -1398,44 +1389,7 @@ bool ChromePasswordProtectionService::Is
1632 bool ChromePasswordProtectionService::IsPingingEnabled( 1643 bool ChromePasswordProtectionService::IsPingingEnabled(
1633 LoginReputationClientRequest::TriggerType trigger_type, 1644 LoginReputationClientRequest::TriggerType trigger_type,
1634 ReusedPasswordAccountType password_type) { 1645 ReusedPasswordAccountType password_type) {
@@ -1656,7 +1667,7 @@
1656-// Only saved password and GAIA password reuse warnings are shown to users on 1667-// Only saved password and GAIA password reuse warnings are shown to users on
1657-// Android, so other types of password reuse events should be gated by Safe 1668-// Android, so other types of password reuse events should be gated by Safe
1658-// Browsing extended reporting. 1669-// Browsing extended reporting.
1659-#if defined(OS_ANDROID) 1670-#if BUILDFLAG(IS_ANDROID)
1660- if (password_type.account_type() == 1671- if (password_type.account_type() ==
1661- ReusedPasswordAccountType::SAVED_PASSWORD || 1672- ReusedPasswordAccountType::SAVED_PASSWORD ||
1662- IsSyncingGMAILPasswordWithSignedInProtectionEnabled(password_type)) { 1673- IsSyncingGMAILPasswordWithSignedInProtectionEnabled(password_type)) {
@@ -1674,8 +1685,8 @@
1674 } 1685 }
1675 1686
1676 RequestOutcome ChromePasswordProtectionService::GetPingNotSentReason( 1687 RequestOutcome ChromePasswordProtectionService::GetPingNotSentReason(
1677@@ -1661,22 +1615,6 @@ MaybeCreateNavigationThrottle(content::N 1688@@ -1664,22 +1618,6 @@ MaybeCreateCommitDeferringCondition(
1678 : nullptr; 1689 : nullptr;
1679 } 1690 }
1680 1691
1681-PasswordProtectionTrigger 1692-PasswordProtectionTrigger
@@ -1697,9 +1708,9 @@
1697 bool ChromePasswordProtectionService::IsURLAllowlistedForPasswordEntry( 1708 bool ChromePasswordProtectionService::IsURLAllowlistedForPasswordEntry(
1698 const GURL& url) const { 1709 const GURL& url) const {
1699 if (!profile_) 1710 if (!profile_)
1700--- chrome/browser/safe_browsing/chrome_password_protection_service.h.orig 1711--- a/chrome/browser/safe_browsing/chrome_password_protection_service.h
1701+++ chrome/browser/safe_browsing/chrome_password_protection_service.h 1712+++ b/chrome/browser/safe_browsing/chrome_password_protection_service.h
1702@@ -211,13 +211,6 @@ class ChromePasswordProtectionService : 1713@@ -215,13 +215,6 @@ class ChromePasswordProtectionService :
1703 bool UserClickedThroughSBInterstitial( 1714 bool UserClickedThroughSBInterstitial(
1704 PasswordProtectionRequest* request) override; 1715 PasswordProtectionRequest* request) override;
1705 1716
@@ -1713,9 +1724,9 @@
1713 // If |url| matches Safe Browsing allowlist domains, password protection 1724 // If |url| matches Safe Browsing allowlist domains, password protection
1714 // change password URL, or password protection login URLs in the enterprise 1725 // change password URL, or password protection login URLs in the enterprise
1715 // policy. 1726 // policy.
1716--- chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc.orig 1727--- a/chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc
1717+++ chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc 1728+++ b/chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc
1718@@ -38,7 +38,6 @@ 1729@@ -39,7 +39,6 @@
1719 #include "components/safe_browsing/content/browser/password_protection/password_protection_test_util.h" 1730 #include "components/safe_browsing/content/browser/password_protection/password_protection_test_util.h"
1720 #include "components/safe_browsing/core/browser/password_protection/metrics_util.h" 1731 #include "components/safe_browsing/core/browser/password_protection/metrics_util.h"
1721 #include "components/safe_browsing/core/common/features.h" 1732 #include "components/safe_browsing/core/common/features.h"
@@ -1723,9 +1734,9 @@
1723 #include "components/security_state/core/security_state.h" 1734 #include "components/security_state/core/security_state.h"
1724 #include "components/signin/public/identity_manager/account_info.h" 1735 #include "components/signin/public/identity_manager/account_info.h"
1725 #include "components/signin/public/identity_manager/identity_test_environment.h" 1736 #include "components/signin/public/identity_manager/identity_test_environment.h"
1726--- chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc.orig 1737--- a/chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc
1727+++ chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc 1738+++ b/chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc
1728@@ -28,9 +28,7 @@ 1739@@ -29,9 +29,7 @@
1729 #include "components/prefs/pref_service.h" 1740 #include "components/prefs/pref_service.h"
1730 #include "components/prefs/scoped_user_pref_update.h" 1741 #include "components/prefs/scoped_user_pref_update.h"
1731 #include "components/safe_browsing/content/browser/password_protection/password_protection_request_content.h" 1742 #include "components/safe_browsing/content/browser/password_protection/password_protection_request_content.h"
@@ -1735,9 +1746,9 @@
1735 #include "components/signin/public/identity_manager/identity_manager.h" 1746 #include "components/signin/public/identity_manager/identity_manager.h"
1736 #include "components/signin/public/identity_manager/identity_test_utils.h" 1747 #include "components/signin/public/identity_manager/identity_test_utils.h"
1737 #include "components/sync/driver/sync_service.h" 1748 #include "components/sync/driver/sync_service.h"
1738--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 1749--- a/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
1739+++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc 1750+++ b/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
1740@@ -34,7 +34,6 @@ 1751@@ -36,7 +36,6 @@
1741 #include "components/prefs/pref_service.h" 1752 #include "components/prefs/pref_service.h"
1742 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" 1753 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
1743 #include "components/safe_browsing/core/common/features.h" 1754 #include "components/safe_browsing/core/common/features.h"
@@ -1745,9 +1756,9 @@
1745 1756
1746 #include "content/public/browser/browser_task_traits.h" 1757 #include "content/public/browser/browser_task_traits.h"
1747 #include "content/public/browser/browser_thread.h" 1758 #include "content/public/browser/browser_thread.h"
1748--- chrome/browser/safe_browsing/download_protection/check_client_download_request.cc.orig 1759--- a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
1749+++ chrome/browser/safe_browsing/download_protection/check_client_download_request.cc 1760+++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
1750@@ -38,7 +38,6 @@ 1761@@ -37,7 +37,6 @@
1751 #include "components/safe_browsing/content/common/file_type_policies.h" 1762 #include "components/safe_browsing/content/common/file_type_policies.h"
1752 #include "components/safe_browsing/core/common/features.h" 1763 #include "components/safe_browsing/core/common/features.h"
1753 #include "components/safe_browsing/core/common/proto/csd.pb.h" 1764 #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -1755,8 +1766,8 @@
1755 #include "components/safe_browsing/core/common/utils.h" 1766 #include "components/safe_browsing/core/common/utils.h"
1756 #include "components/url_matcher/url_matcher.h" 1767 #include "components/url_matcher/url_matcher.h"
1757 #include "content/public/browser/browser_context.h" 1768 #include "content/public/browser/browser_context.h"
1758--- chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc.orig 1769--- a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc
1759+++ chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc 1770+++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc
1760@@ -24,7 +24,6 @@ 1771@@ -24,7 +24,6 @@
1761 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" 1772 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
1762 #include "components/safe_browsing/content/common/file_type_policies.h" 1773 #include "components/safe_browsing/content/common/file_type_policies.h"
@@ -1765,9 +1776,9 @@
1765 #include "components/safe_browsing/core/common/utils.h" 1776 #include "components/safe_browsing/core/common/utils.h"
1766 #include "content/public/browser/browser_context.h" 1777 #include "content/public/browser/browser_context.h"
1767 #include "content/public/browser/browser_task_traits.h" 1778 #include "content/public/browser/browser_task_traits.h"
1768--- chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc.orig 1779--- a/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc
1769+++ chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc 1780+++ b/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc
1770@@ -93,7 +93,6 @@ 1781@@ -95,7 +95,6 @@
1771 #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" 1782 #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
1772 #include "components/safe_browsing/core/common/features.h" 1783 #include "components/safe_browsing/core/common/features.h"
1773 #include "components/safe_browsing/core/common/proto/csd.pb.h" 1784 #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -1775,8 +1786,8 @@
1775 #include "components/safe_browsing/core/common/safebrowsing_switches.h" 1786 #include "components/safe_browsing/core/common/safebrowsing_switches.h"
1776 #include "components/signin/public/identity_manager/identity_test_environment.h" 1787 #include "components/signin/public/identity_manager/identity_test_environment.h"
1777 #include "content/public/browser/browser_task_traits.h" 1788 #include "content/public/browser/browser_task_traits.h"
1778--- chrome/browser/safe_browsing/generated_safe_browsing_pref.cc.orig 1789--- a/chrome/browser/safe_browsing/generated_safe_browsing_pref.cc
1779+++ chrome/browser/safe_browsing/generated_safe_browsing_pref.cc 1790+++ b/chrome/browser/safe_browsing/generated_safe_browsing_pref.cc
1780@@ -7,7 +7,6 @@ 1791@@ -7,7 +7,6 @@
1781 #include "chrome/browser/profiles/profile.h" 1792 #include "chrome/browser/profiles/profile.h"
1782 #include "chrome/common/extensions/api/settings_private.h" 1793 #include "chrome/common/extensions/api/settings_private.h"
@@ -1807,7 +1818,7 @@
1807 } 1818 }
1808 1819
1809 extensions::settings_private::SetPrefResult GeneratedSafeBrowsingPref::SetPref( 1820 extensions::settings_private::SetPrefResult GeneratedSafeBrowsingPref::SetPref(
1810@@ -48,31 +32,14 @@ extensions::settings_private::SetPrefRes 1821@@ -48,37 +32,14 @@ extensions::settings_private::SetPrefRes
1811 return extensions::settings_private::SetPrefResult::PREF_TYPE_MISMATCH; 1822 return extensions::settings_private::SetPrefResult::PREF_TYPE_MISMATCH;
1812 1823
1813 // If SBER is forcefully disabled, Enhanced cannot be selected by the user. 1824 // If SBER is forcefully disabled, Enhanced cannot be selected by the user.
@@ -1838,10 +1849,16 @@
1838- profile_->GetPrefs()->SetBoolean(prefs::kSafeBrowsingEnhanced, 1849- profile_->GetPrefs()->SetBoolean(prefs::kSafeBrowsingEnhanced,
1839- selection == SafeBrowsingSetting::ENHANCED); 1850- selection == SafeBrowsingSetting::ENHANCED);
1840- 1851-
1852- // Set ESB not set in sync with Account ESB through TailoredSecurity.
1853- if (selection == SafeBrowsingSetting::ENHANCED) {
1854- profile_->GetPrefs()->SetBoolean(
1855- prefs::kEnhancedProtectionEnabledViaTailoredSecurity, false);
1856- }
1857-
1841 return extensions::settings_private::SetPrefResult::SUCCESS; 1858 return extensions::settings_private::SetPrefResult::SUCCESS;
1842 } 1859 }
1843 1860
1844@@ -83,10 +50,8 @@ GeneratedSafeBrowsingPref::GetPrefObject 1861@@ -89,10 +50,8 @@ GeneratedSafeBrowsingPref::GetPrefObject
1845 pref_object->key = kGeneratedSafeBrowsingPref; 1862 pref_object->key = kGeneratedSafeBrowsingPref;
1846 pref_object->type = extensions::api::settings_private::PREF_TYPE_NUMBER; 1863 pref_object->type = extensions::api::settings_private::PREF_TYPE_NUMBER;
1847 1864
@@ -1854,7 +1871,7 @@
1854 1871
1855 if (safe_browsing_enhanced_enabled && safe_browsing_enabled) { 1872 if (safe_browsing_enhanced_enabled && safe_browsing_enabled) {
1856 pref_object->value = std::make_unique<base::Value>( 1873 pref_object->value = std::make_unique<base::Value>(
1857@@ -116,29 +81,18 @@ void GeneratedSafeBrowsingPref::ApplySaf 1874@@ -122,29 +81,18 @@ void GeneratedSafeBrowsingPref::ApplySaf
1858 // three different preferences. It is possible that these may be in 1875 // three different preferences. It is possible that these may be in
1859 // temporarily conflicting managed states. The enabled preference is always 1876 // temporarily conflicting managed states. The enabled preference is always
1860 // taken as the canonical source of management. 1877 // taken as the canonical source of management.
@@ -1890,7 +1907,7 @@
1890 1907
1891 if (!enabled_enforced && !enabled_recommended && !reporting_enforced) { 1908 if (!enabled_enforced && !enabled_recommended && !reporting_enforced) {
1892 // No relevant policies are applied. 1909 // No relevant policies are applied.
1893@@ -148,8 +102,6 @@ void GeneratedSafeBrowsingPref::ApplySaf 1910@@ -154,8 +102,6 @@ void GeneratedSafeBrowsingPref::ApplySaf
1894 if (enabled_enforced) { 1911 if (enabled_enforced) {
1895 // Preference is fully controlled. 1912 // Preference is fully controlled.
1896 pref_object->enforcement = settings_api::Enforcement::ENFORCEMENT_ENFORCED; 1913 pref_object->enforcement = settings_api::Enforcement::ENFORCEMENT_ENFORCED;
@@ -1899,7 +1916,7 @@
1899 return; 1916 return;
1900 } 1917 }
1901 1918
1902@@ -174,8 +126,6 @@ void GeneratedSafeBrowsingPref::ApplySaf 1919@@ -180,8 +126,6 @@ void GeneratedSafeBrowsingPref::ApplySaf
1903 // Reporting has been forcefully disabled by policy. Enhanced protection is 1920 // Reporting has been forcefully disabled by policy. Enhanced protection is
1904 // thus also implicitly disabled by the same policy. 1921 // thus also implicitly disabled by the same policy.
1905 pref_object->enforcement = settings_api::Enforcement::ENFORCEMENT_ENFORCED; 1922 pref_object->enforcement = settings_api::Enforcement::ENFORCEMENT_ENFORCED;
@@ -1908,9 +1925,9 @@
1908 1925
1909 pref_object->user_selectable_values = 1926 pref_object->user_selectable_values =
1910 std::make_unique<std::vector<std::unique_ptr<base::Value>>>(); 1927 std::make_unique<std::vector<std::unique_ptr<base::Value>>>();
1911--- chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc.orig 1928--- a/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc
1912+++ chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc 1929+++ b/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc
1913@@ -22,7 +22,6 @@ 1930@@ -23,7 +23,6 @@
1914 #include "chrome/test/base/testing_profile.h" 1931 #include "chrome/test/base/testing_profile.h"
1915 #include "chrome/test/base/testing_profile_manager.h" 1932 #include "chrome/test/base/testing_profile_manager.h"
1916 #include "components/safe_browsing/core/common/proto/csd.pb.h" 1933 #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -1918,9 +1935,9 @@
1918 #include "components/sync_preferences/testing_pref_service_syncable.h" 1935 #include "components/sync_preferences/testing_pref_service_syncable.h"
1919 #include "content/public/test/browser_task_environment.h" 1936 #include "content/public/test/browser_task_environment.h"
1920 #include "content/public/test/test_utils.h" 1937 #include "content/public/test/test_utils.h"
1921--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 1938--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
1922+++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc 1939+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
1923@@ -42,7 +42,6 @@ 1940@@ -40,7 +40,6 @@
1924 #include "components/prefs/pref_service.h" 1941 #include "components/prefs/pref_service.h"
1925 #include "components/safe_browsing/core/common/features.h" 1942 #include "components/safe_browsing/core/common/features.h"
1926 #include "components/safe_browsing/core/common/proto/csd.pb.h" 1943 #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -1928,8 +1945,8 @@
1928 #include "content/public/browser/browser_thread.h" 1945 #include "content/public/browser/browser_thread.h"
1929 #include "content/public/browser/download_item_utils.h" 1946 #include "content/public/browser/download_item_utils.h"
1930 #include "services/network/public/cpp/shared_url_loader_factory.h" 1947 #include "services/network/public/cpp/shared_url_loader_factory.h"
1931--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc.orig 1948--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
1932+++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc 1949+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
1933@@ -36,7 +36,6 @@ 1950@@ -36,7 +36,6 @@
1934 #include "chrome/test/base/testing_profile.h" 1951 #include "chrome/test/base/testing_profile.h"
1935 #include "chrome/test/base/testing_profile_manager.h" 1952 #include "chrome/test/base/testing_profile_manager.h"
@@ -1938,8 +1955,8 @@
1938 #include "components/sync_preferences/testing_pref_service_syncable.h" 1955 #include "components/sync_preferences/testing_pref_service_syncable.h"
1939 #include "content/public/test/browser_task_environment.h" 1956 #include "content/public/test/browser_task_environment.h"
1940 #include "extensions/browser/quota_service.h" 1957 #include "extensions/browser/quota_service.h"
1941--- chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc.orig 1958--- a/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc
1942+++ chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc 1959+++ b/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc
1943@@ -43,7 +43,6 @@ 1960@@ -43,7 +43,6 @@
1944 #include "components/history/core/browser/history_database_params.h" 1961 #include "components/history/core/browser/history_database_params.h"
1945 #include "components/history/core/browser/history_service.h" 1962 #include "components/history/core/browser/history_service.h"
@@ -1948,8 +1965,8 @@
1948 #include "components/sync_preferences/testing_pref_service_syncable.h" 1965 #include "components/sync_preferences/testing_pref_service_syncable.h"
1949 #include "content/public/test/browser_task_environment.h" 1966 #include "content/public/test/browser_task_environment.h"
1950 #include "content/public/test/test_utils.h" 1967 #include "content/public/test/test_utils.h"
1951--- chrome/browser/safe_browsing/incident_reporting/state_store.cc.orig 1968--- a/chrome/browser/safe_browsing/incident_reporting/state_store.cc
1952+++ chrome/browser/safe_browsing/incident_reporting/state_store.cc 1969+++ b/chrome/browser/safe_browsing/incident_reporting/state_store.cc
1953@@ -14,7 +14,6 @@ 1970@@ -14,7 +14,6 @@
1954 #include "chrome/browser/safe_browsing/incident_reporting/incident.h" 1971 #include "chrome/browser/safe_browsing/incident_reporting/incident.h"
1955 #include "chrome/browser/safe_browsing/incident_reporting/platform_state_store.h" 1972 #include "chrome/browser/safe_browsing/incident_reporting/platform_state_store.h"
@@ -1958,8 +1975,8 @@
1958 1975
1959 namespace safe_browsing { 1976 namespace safe_browsing {
1960 1977
1961--- chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc.orig 1978--- a/chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc
1962+++ chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc 1979+++ b/chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc
1963@@ -21,7 +21,6 @@ 1980@@ -21,7 +21,6 @@
1964 #include "chrome/test/base/testing_profile.h" 1981 #include "chrome/test/base/testing_profile.h"
1965 #include "chrome/test/base/testing_profile_manager.h" 1982 #include "chrome/test/base/testing_profile_manager.h"
@@ -1968,8 +1985,8 @@
1968 #include "components/sync_preferences/pref_service_syncable.h" 1985 #include "components/sync_preferences/pref_service_syncable.h"
1969 #include "components/sync_preferences/pref_service_syncable_factory.h" 1986 #include "components/sync_preferences/pref_service_syncable_factory.h"
1970 #include "content/public/test/browser_task_environment.h" 1987 #include "content/public/test/browser_task_environment.h"
1971--- chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc.orig 1988--- a/chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc
1972+++ chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc 1989+++ b/chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc
1973@@ -7,7 +7,6 @@ 1990@@ -7,7 +7,6 @@
1974 #include "base/metrics/histogram_functions.h" 1991 #include "base/metrics/histogram_functions.h"
1975 #include "chrome/browser/profiles/profile.h" 1992 #include "chrome/browser/profiles/profile.h"
@@ -1978,9 +1995,9 @@
1978 1995
1979 namespace safe_browsing { 1996 namespace safe_browsing {
1980 1997
1981--- chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc.orig 1998--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
1982+++ chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc 1999+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
1983@@ -74,7 +74,6 @@ 2000@@ -79,7 +79,6 @@
1984 #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h" 2001 #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h"
1985 #include "components/safe_browsing/core/browser/verdict_cache_manager.h" 2002 #include "components/safe_browsing/core/browser/verdict_cache_manager.h"
1986 #include "components/safe_browsing/core/common/features.h" 2003 #include "components/safe_browsing/core/common/features.h"
@@ -1988,9 +2005,9 @@
1988 #include "components/safe_browsing/core/common/web_ui_constants.h" 2005 #include "components/safe_browsing/core/common/web_ui_constants.h"
1989 #include "components/security_interstitials/content/security_interstitial_controller_client.h" 2006 #include "components/security_interstitials/content/security_interstitial_controller_client.h"
1990 #include "components/security_interstitials/content/security_interstitial_tab_helper.h" 2007 #include "components/security_interstitials/content/security_interstitial_tab_helper.h"
1991--- chrome/browser/safe_browsing/safe_browsing_service.cc.orig 2008--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
1992+++ chrome/browser/safe_browsing/safe_browsing_service.cc 2009+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
1993@@ -103,7 +103,6 @@ base::FilePath SafeBrowsingService::GetB 2010@@ -121,7 +121,6 @@ base::FilePath SafeBrowsingService::GetB
1994 2011
1995 SafeBrowsingService::SafeBrowsingService() 2012 SafeBrowsingService::SafeBrowsingService()
1996 : services_delegate_(ServicesDelegate::Create(this)), 2013 : services_delegate_(ServicesDelegate::Create(this)),
@@ -1998,7 +2015,7 @@
1998 shutdown_(false), 2015 shutdown_(false),
1999 enabled_(false), 2016 enabled_(false),
2000 enabled_by_prefs_(false) {} 2017 enabled_by_prefs_(false) {}
2001@@ -257,8 +256,6 @@ TriggerManager* SafeBrowsingService::tri 2018@@ -249,8 +248,6 @@ TriggerManager* SafeBrowsingService::tri
2002 2019
2003 PasswordProtectionService* SafeBrowsingService::GetPasswordProtectionService( 2020 PasswordProtectionService* SafeBrowsingService::GetPasswordProtectionService(
2004 Profile* profile) const { 2021 Profile* profile) const {
@@ -2007,7 +2024,7 @@
2007 return nullptr; 2024 return nullptr;
2008 } 2025 }
2009 2026
2010@@ -387,9 +384,6 @@ void SafeBrowsingService::OnProfileAdded 2027@@ -342,9 +339,6 @@ void SafeBrowsingService::OnProfileAdded
2011 std::unique_ptr<PrefChangeRegistrar> registrar = 2028 std::unique_ptr<PrefChangeRegistrar> registrar =
2012 std::make_unique<PrefChangeRegistrar>(); 2029 std::make_unique<PrefChangeRegistrar>();
2013 registrar->Init(pref_service); 2030 registrar->Init(pref_service);
@@ -2017,7 +2034,7 @@
2017 // ClientSideDetectionService will need to be refresh the models 2034 // ClientSideDetectionService will need to be refresh the models
2018 // renderers have if extended-reporting changes. 2035 // renderers have if extended-reporting changes.
2019 registrar->Add(prefs::kSafeBrowsingScoutReportingEnabled, 2036 registrar->Add(prefs::kSafeBrowsingScoutReportingEnabled,
2020@@ -418,14 +412,6 @@ void SafeBrowsingService::OnProfileAdded 2037@@ -373,14 +367,6 @@ void SafeBrowsingService::OnProfileAdded
2021 NoCachedPopulationReason::kChangeMbbPref)); 2038 NoCachedPopulationReason::kChangeMbbPref));
2022 user_population_prefs_[pref_service] = std::move(registrar); 2039 user_population_prefs_[pref_service] = std::move(registrar);
2023 2040
@@ -2032,7 +2049,7 @@
2032 // Extended Reporting metrics are handled together elsewhere. 2049 // Extended Reporting metrics are handled together elsewhere.
2033 RecordExtendedReportingMetrics(*pref_service); 2050 RecordExtendedReportingMetrics(*pref_service);
2034 2051
2035@@ -465,18 +451,6 @@ void SafeBrowsingService::RefreshState() 2052@@ -423,18 +409,6 @@ void SafeBrowsingService::RefreshState()
2036 2053
2037 // Check if any profile requires the service to be active. 2054 // Check if any profile requires the service to be active.
2038 enabled_by_prefs_ = false; 2055 enabled_by_prefs_ = false;
@@ -2051,9 +2068,9 @@
2051 2068
2052 if (enabled_by_prefs_) 2069 if (enabled_by_prefs_)
2053 Start(); 2070 Start();
2054--- chrome/browser/safe_browsing/safe_browsing_service.h.orig 2071--- a/chrome/browser/safe_browsing/safe_browsing_service.h
2055+++ chrome/browser/safe_browsing/safe_browsing_service.h 2072+++ b/chrome/browser/safe_browsing/safe_browsing_service.h
2056@@ -28,7 +28,6 @@ 2073@@ -27,7 +27,6 @@
2057 #include "components/safe_browsing/buildflags.h" 2074 #include "components/safe_browsing/buildflags.h"
2058 #include "components/safe_browsing/content/browser/safe_browsing_service_interface.h" 2075 #include "components/safe_browsing/content/browser/safe_browsing_service_interface.h"
2059 #include "components/safe_browsing/core/browser/db/util.h" 2076 #include "components/safe_browsing/core/browser/db/util.h"
@@ -2061,7 +2078,7 @@
2061 #include "content/public/browser/browser_context.h" 2078 #include "content/public/browser/browser_context.h"
2062 #include "content/public/browser/browser_thread.h" 2079 #include "content/public/browser/browser_thread.h"
2063 #include "services/network/public/mojom/network_context.mojom-forward.h" 2080 #include "services/network/public/mojom/network_context.mojom-forward.h"
2064@@ -97,15 +96,6 @@ class SafeBrowsingService : public SafeB 2081@@ -94,15 +93,6 @@ class SafeBrowsingService : public SafeB
2065 // Called on the main thread to let us know that the io_thread is going away. 2082 // Called on the main thread to let us know that the io_thread is going away.
2066 void ShutDown(); 2083 void ShutDown();
2067 2084
@@ -2077,9 +2094,9 @@
2077 // Get current enabled status. Must be called on IO thread. 2094 // Get current enabled status. Must be called on IO thread.
2078 bool enabled() const { 2095 bool enabled() const {
2079 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 2096 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
2080@@ -287,10 +277,6 @@ class SafeBrowsingService : public SafeB 2097@@ -267,10 +257,6 @@ class SafeBrowsingService : public SafeB
2081 // Provides phishing and malware statistics. Accessed on UI thread. 2098
2082 std::unique_ptr<PingManager> ping_manager_; 2099 std::unique_ptr<ProxyConfigMonitor> proxy_config_monitor_;
2083 2100
2084- // Whether SafeBrowsing Extended Reporting is enabled by the current set of 2101- // Whether SafeBrowsing Extended Reporting is enabled by the current set of
2085- // profiles. Updated on the UI thread. 2102- // profiles. Updated on the UI thread.
@@ -2088,9 +2105,9 @@
2088 // Whether the service has been shutdown. 2105 // Whether the service has been shutdown.
2089 bool shutdown_; 2106 bool shutdown_;
2090 2107
2091--- chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc.orig 2108--- a/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc
2092+++ chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc 2109+++ b/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc
2093@@ -27,7 +27,6 @@ 2110@@ -28,7 +28,6 @@
2094 #include "components/safe_browsing/core/browser/db/database_manager.h" 2111 #include "components/safe_browsing/core/browser/db/database_manager.h"
2095 #include "components/safe_browsing/core/browser/ping_manager.h" 2112 #include "components/safe_browsing/core/browser/ping_manager.h"
2096 #include "components/safe_browsing/core/common/features.h" 2113 #include "components/safe_browsing/core/common/features.h"
@@ -2098,7 +2115,7 @@
2098 #include "content/public/browser/browser_task_traits.h" 2115 #include "content/public/browser/browser_task_traits.h"
2099 #include "content/public/browser/browser_thread.h" 2116 #include "content/public/browser/browser_thread.h"
2100 #include "content/public/browser/download_item_utils.h" 2117 #include "content/public/browser/download_item_utils.h"
2101@@ -142,11 +141,9 @@ bool AndroidTelemetryService::CanSendPin 2118@@ -141,11 +140,9 @@ bool AndroidTelemetryService::CanSendPin
2102 return false; 2119 return false;
2103 } 2120 }
2104 2121
@@ -2113,9 +2130,9 @@
2113 2130
2114 if (profile_->IsOffTheRecord()) { 2131 if (profile_->IsOffTheRecord()) {
2115 RecordApkDownloadTelemetryOutcome( 2132 RecordApkDownloadTelemetryOutcome(
2116--- chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc.orig 2133--- a/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc
2117+++ chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc 2134+++ b/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc
2118@@ -18,7 +18,6 @@ 2135@@ -19,7 +19,6 @@
2119 #include "components/download/public/common/mock_download_item.h" 2136 #include "components/download/public/common/mock_download_item.h"
2120 #include "components/prefs/pref_service.h" 2137 #include "components/prefs/pref_service.h"
2121 #include "components/safe_browsing/core/common/features.h" 2138 #include "components/safe_browsing/core/common/features.h"
@@ -2123,8 +2140,8 @@
2123 #include "content/public/browser/browser_task_traits.h" 2140 #include "content/public/browser/browser_task_traits.h"
2124 #include "content/public/browser/browser_thread.h" 2141 #include "content/public/browser/browser_thread.h"
2125 #include "content/public/browser/download_item_utils.h" 2142 #include "content/public/browser/download_item_utils.h"
2126--- chrome/browser/safe_browsing/url_checker_delegate_impl.cc.orig 2143--- a/chrome/browser/safe_browsing/url_checker_delegate_impl.cc
2127+++ chrome/browser/safe_browsing/url_checker_delegate_impl.cc 2144+++ b/chrome/browser/safe_browsing/url_checker_delegate_impl.cc
2128@@ -21,7 +21,6 @@ 2145@@ -21,7 +21,6 @@
2129 #include "components/safe_browsing/core/browser/db/database_manager.h" 2146 #include "components/safe_browsing/core/browser/db/database_manager.h"
2130 #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" 2147 #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
@@ -2133,9 +2150,9 @@
2133 #include "components/security_interstitials/content/unsafe_resource_util.h" 2150 #include "components/security_interstitials/content/unsafe_resource_util.h"
2134 #include "content/public/browser/browser_task_traits.h" 2151 #include "content/public/browser/browser_task_traits.h"
2135 #include "content/public/browser/browser_thread.h" 2152 #include "content/public/browser/browser_thread.h"
2136--- chrome/browser/signin/account_consistency_mode_manager.cc.orig 2153--- a/chrome/browser/signin/account_consistency_mode_manager.cc
2137+++ chrome/browser/signin/account_consistency_mode_manager.cc 2154+++ b/chrome/browser/signin/account_consistency_mode_manager.cc
2138@@ -19,7 +19,6 @@ 2155@@ -20,7 +20,6 @@
2139 #include "components/pref_registry/pref_registry_syncable.h" 2156 #include "components/pref_registry/pref_registry_syncable.h"
2140 #include "components/prefs/pref_service.h" 2157 #include "components/prefs/pref_service.h"
2141 #include "components/signin/public/base/signin_buildflags.h" 2158 #include "components/signin/public/base/signin_buildflags.h"
@@ -2143,7 +2160,7 @@
2143 #include "google_apis/google_api_keys.h" 2160 #include "google_apis/google_api_keys.h"
2144 2161
2145 #if BUILDFLAG(IS_CHROMEOS_ASH) 2162 #if BUILDFLAG(IS_CHROMEOS_ASH)
2146@@ -98,7 +97,6 @@ AccountConsistencyModeManager::AccountCo 2163@@ -97,7 +96,6 @@ AccountConsistencyModeManager::AccountCo
2147 // pref. 2164 // pref.
2148 bool signin_allowed = IsDiceSignInAllowed() && 2165 bool signin_allowed = IsDiceSignInAllowed() &&
2149 prefs->GetBoolean(prefs::kSigninAllowedOnNextStartup); 2166 prefs->GetBoolean(prefs::kSigninAllowedOnNextStartup);
@@ -2151,8 +2168,8 @@
2151 2168
2152 UMA_HISTOGRAM_BOOLEAN("Signin.SigninAllowed", signin_allowed); 2169 UMA_HISTOGRAM_BOOLEAN("Signin.SigninAllowed", signin_allowed);
2153 #endif 2170 #endif
2154@@ -196,16 +194,7 @@ AccountConsistencyModeManager::ComputeAc 2171@@ -192,16 +190,7 @@ AccountConsistencyModeManager::ComputeAc
2155 // AccountManager is not available, when DICE has been disabled on Lacros. 2172 return AccountConsistencyMethod::kMirror;
2156 #endif 2173 #endif
2157 2174
2158-#if BUILDFLAG(ENABLE_DICE_SUPPORT) 2175-#if BUILDFLAG(ENABLE_DICE_SUPPORT)
@@ -2168,9 +2185,9 @@
2168- NOTREACHED(); 2185- NOTREACHED();
2169 return AccountConsistencyMethod::kDisabled; 2186 return AccountConsistencyMethod::kDisabled;
2170 } 2187 }
2171--- chrome/browser/signin/account_consistency_mode_manager_unittest.cc.orig 2188--- a/chrome/browser/signin/account_consistency_mode_manager_unittest.cc
2172+++ chrome/browser/signin/account_consistency_mode_manager_unittest.cc 2189+++ b/chrome/browser/signin/account_consistency_mode_manager_unittest.cc
2173@@ -20,7 +20,6 @@ 2190@@ -19,7 +19,6 @@
2174 #include "components/prefs/testing_pref_store.h" 2191 #include "components/prefs/testing_pref_store.h"
2175 #include "components/signin/public/base/account_consistency_method.h" 2192 #include "components/signin/public/base/account_consistency_method.h"
2176 #include "components/signin/public/base/signin_buildflags.h" 2193 #include "components/signin/public/base/signin_buildflags.h"
@@ -2178,33 +2195,33 @@
2178 #include "components/sync_preferences/testing_pref_service_syncable.h" 2195 #include "components/sync_preferences/testing_pref_service_syncable.h"
2179 #include "content/public/test/browser_task_environment.h" 2196 #include "content/public/test/browser_task_environment.h"
2180 #include "testing/gtest/include/gtest/gtest.h" 2197 #include "testing/gtest/include/gtest/gtest.h"
2181--- chrome/browser/signin/chrome_device_id_helper.cc.orig 2198--- a/chrome/browser/signin/chrome_device_id_helper.cc
2182+++ chrome/browser/signin/chrome_device_id_helper.cc 2199+++ b/chrome/browser/signin/chrome_device_id_helper.cc
2183@@ -16,7 +16,6 @@ 2200@@ -17,7 +17,6 @@
2184 #include "base/logging.h"
2185 #include "chrome/browser/ash/profiles/profile_helper.h" 2201 #include "chrome/browser/ash/profiles/profile_helper.h"
2202 #include "chrome/browser/browser_process.h"
2186 #include "components/prefs/pref_service.h" 2203 #include "components/prefs/pref_service.h"
2187-#include "components/signin/public/base/signin_pref_names.h" 2204-#include "components/signin/public/base/signin_pref_names.h"
2188 #include "components/signin/public/base/signin_switches.h" 2205 #include "components/signin/public/base/signin_switches.h"
2189 #include "components/user_manager/known_user.h" 2206 #include "components/user_manager/known_user.h"
2190 #include "components/user_manager/user_manager.h" 2207 #include "components/user_manager/user_manager.h"
2191@@ -67,21 +66,11 @@ void MigrateSigninScopedDeviceId(Profile 2208@@ -70,21 +69,11 @@ void MigrateSigninScopedDeviceId(Profile
2192 return; 2209 user_manager::KnownUser known_user(g_browser_process->local_state());
2193 const AccountId account_id = user->GetAccountId(); 2210 const AccountId account_id = user->GetAccountId();
2194 if (user_manager::known_user::GetDeviceId(account_id).empty()) { 2211 if (known_user.GetDeviceId(account_id).empty()) {
2195- const std::string legacy_device_id = profile->GetPrefs()->GetString( 2212- const std::string legacy_device_id = profile->GetPrefs()->GetString(
2196- prefs::kGoogleServicesSigninScopedDeviceId); 2213- prefs::kGoogleServicesSigninScopedDeviceId);
2197- if (!legacy_device_id.empty()) { 2214- if (!legacy_device_id.empty()) {
2198- // Need to move device ID from the old location to the new one, if it has 2215- // Need to move device ID from the old location to the new one, if it has
2199- // not been done yet. 2216- // not been done yet.
2200- user_manager::known_user::SetDeviceId(account_id, legacy_device_id); 2217- known_user.SetDeviceId(account_id, legacy_device_id);
2201- } else { 2218- } else {
2202- user_manager::known_user::SetDeviceId( 2219- known_user.SetDeviceId(
2203- account_id, GenerateSigninScopedDeviceId( 2220- account_id, GenerateSigninScopedDeviceId(
2204- user_manager::UserManager::Get() 2221- user_manager::UserManager::Get()
2205- ->IsUserNonCryptohomeDataEphemeral(account_id))); 2222- ->IsUserNonCryptohomeDataEphemeral(account_id)));
2206- } 2223- }
2207+ user_manager::known_user::SetDeviceId( 2224+ known_user.SetDeviceId(
2208+ account_id, GenerateSigninScopedDeviceId( 2225+ account_id, GenerateSigninScopedDeviceId(
2209+ user_manager::UserManager::Get() 2226+ user_manager::UserManager::Get()
2210+ ->IsUserNonCryptohomeDataEphemeral(account_id))); 2227+ ->IsUserNonCryptohomeDataEphemeral(account_id)));
@@ -2214,8 +2231,8 @@
2214 } 2231 }
2215 2232
2216 #endif 2233 #endif
2217--- chrome/browser/signin/chrome_signin_client.cc.orig 2234--- a/chrome/browser/signin/chrome_signin_client.cc
2218+++ chrome/browser/signin/chrome_signin_client.cc 2235+++ b/chrome/browser/signin/chrome_signin_client.cc
2219@@ -38,7 +38,6 @@ 2236@@ -38,7 +38,6 @@
2220 #include "components/prefs/pref_service.h" 2237 #include "components/prefs/pref_service.h"
2221 #include "components/signin/core/browser/cookie_settings_util.h" 2238 #include "components/signin/core/browser/cookie_settings_util.h"
@@ -2224,8 +2241,8 @@
2224 #include "components/signin/public/identity_manager/access_token_info.h" 2241 #include "components/signin/public/identity_manager/access_token_info.h"
2225 #include "components/signin/public/identity_manager/identity_manager.h" 2242 #include "components/signin/public/identity_manager/identity_manager.h"
2226 #include "components/signin/public/identity_manager/scope_set.h" 2243 #include "components/signin/public/identity_manager/scope_set.h"
2227--- chrome/browser/signin/chromeos_mirror_account_consistency_browsertest.cc.orig 2244--- a/chrome/browser/signin/chromeos_mirror_account_consistency_browsertest.cc
2228+++ chrome/browser/signin/chromeos_mirror_account_consistency_browsertest.cc 2245+++ b/chrome/browser/signin/chromeos_mirror_account_consistency_browsertest.cc
2229@@ -21,7 +21,6 @@ 2246@@ -21,7 +21,6 @@
2230 #include "components/network_session_configurator/common/network_switches.h" 2247 #include "components/network_session_configurator/common/network_switches.h"
2231 #include "components/prefs/pref_service.h" 2248 #include "components/prefs/pref_service.h"
@@ -2234,9 +2251,9 @@
2234 #include "components/signin/public/identity_manager/identity_test_utils.h" 2251 #include "components/signin/public/identity_manager/identity_test_utils.h"
2235 #include "components/user_manager/user.h" 2252 #include "components/user_manager/user.h"
2236 #include "components/user_manager/user_manager.h" 2253 #include "components/user_manager/user_manager.h"
2237--- chrome/browser/signin/dice_browsertest.cc.orig 2254--- a/chrome/browser/signin/dice_browsertest.cc
2238+++ chrome/browser/signin/dice_browsertest.cc 2255+++ b/chrome/browser/signin/dice_browsertest.cc
2239@@ -59,7 +59,6 @@ 2256@@ -60,7 +60,6 @@
2240 #include "components/signin/public/base/account_consistency_method.h" 2257 #include "components/signin/public/base/account_consistency_method.h"
2241 #include "components/signin/public/base/signin_client.h" 2258 #include "components/signin/public/base/signin_client.h"
2242 #include "components/signin/public/base/signin_metrics.h" 2259 #include "components/signin/public/base/signin_metrics.h"
@@ -2244,8 +2261,8 @@
2244 #include "components/signin/public/identity_manager/identity_manager.h" 2261 #include "components/signin/public/identity_manager/identity_manager.h"
2245 #include "components/signin/public/identity_manager/identity_test_utils.h" 2262 #include "components/signin/public/identity_manager/identity_test_utils.h"
2246 #include "components/signin/public/identity_manager/primary_account_mutator.h" 2263 #include "components/signin/public/identity_manager/primary_account_mutator.h"
2247--- chrome/browser/signin/header_modification_delegate_impl.cc.orig 2264--- a/chrome/browser/signin/header_modification_delegate_impl.cc
2248+++ chrome/browser/signin/header_modification_delegate_impl.cc 2265+++ b/chrome/browser/signin/header_modification_delegate_impl.cc
2249@@ -15,7 +15,6 @@ 2266@@ -15,7 +15,6 @@
2250 #include "chrome/browser/sync/sync_service_factory.h" 2267 #include "chrome/browser/sync/sync_service_factory.h"
2251 #include "chrome/common/pref_names.h" 2268 #include "chrome/common/pref_names.h"
@@ -2263,9 +2280,9 @@
2263 #endif 2280 #endif
2264 cookie_settings_.get()); 2281 cookie_settings_.get());
2265 } 2282 }
2266--- chrome/browser/signin/mirror_browsertest.cc.orig 2283--- a/chrome/browser/signin/mirror_browsertest.cc
2267+++ chrome/browser/signin/mirror_browsertest.cc 2284+++ b/chrome/browser/signin/mirror_browsertest.cc
2268@@ -31,7 +31,6 @@ 2285@@ -30,7 +30,6 @@
2269 #include "components/prefs/pref_service.h" 2286 #include "components/prefs/pref_service.h"
2270 #include "components/signin/core/browser/dice_header_helper.h" 2287 #include "components/signin/core/browser/dice_header_helper.h"
2271 #include "components/signin/core/browser/signin_header_helper.h" 2288 #include "components/signin/core/browser/signin_header_helper.h"
@@ -2273,29 +2290,97 @@
2273 #include "content/public/common/content_client.h" 2290 #include "content/public/common/content_client.h"
2274 #include "content/public/test/browser_test.h" 2291 #include "content/public/test/browser_test.h"
2275 #include "google_apis/gaia/gaia_urls.h" 2292 #include "google_apis/gaia/gaia_urls.h"
2276--- chrome/browser/signin/signin_manager.cc.orig 2293--- a/chrome/browser/signin/primary_account_policy_manager.cc
2277+++ chrome/browser/signin/signin_manager.cc 2294+++ b/chrome/browser/signin/primary_account_policy_manager.cc
2278@@ -5,7 +5,6 @@ 2295@@ -14,7 +14,6 @@
2279 #include "chrome/browser/signin/signin_manager.h" 2296 #include "chrome/grit/generated_resources.h"
2297 #include "components/prefs/pref_service.h"
2298 #include "components/signin/public/base/signin_metrics.h"
2299-#include "components/signin/public/base/signin_pref_names.h"
2300 #include "components/signin/public/identity_manager/account_info.h"
2301 #include "components/signin/public/identity_manager/identity_manager.h"
2302 #include "components/signin/public/identity_manager/identity_utils.h"
2303@@ -178,23 +177,11 @@ void PrimaryAccountPolicyManager::Initia
2304 EnsurePrimaryAccountAllowedForProfile(
2305 profile_, signin_metrics::SIGNIN_NOT_ALLOWED_ON_PROFILE_INIT);
2280 2306
2307- signin_allowed_.Init(
2308- prefs::kSigninAllowed, profile_->GetPrefs(),
2309- base::BindRepeating(
2310- &PrimaryAccountPolicyManager::OnSigninAllowedPrefChanged,
2311- weak_pointer_factory_.GetWeakPtr()));
2312-
2313 local_state_pref_registrar_.Init(g_browser_process->local_state());
2314- local_state_pref_registrar_.Add(
2315- prefs::kGoogleServicesUsernamePattern,
2316- base::BindRepeating(
2317- &PrimaryAccountPolicyManager::OnGoogleServicesUsernamePatternChanged,
2318- weak_pointer_factory_.GetWeakPtr()));
2319 }
2320
2321 void PrimaryAccountPolicyManager::Shutdown() {
2322 local_state_pref_registrar_.RemoveAll();
2323- signin_allowed_.Destroy();
2324 }
2325
2326 void PrimaryAccountPolicyManager::OnGoogleServicesUsernamePatternChanged() {
2327@@ -219,11 +206,6 @@ void PrimaryAccountPolicyManager::Ensure
2328
2329 CoreAccountInfo primary_account =
2330 identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync);
2331- if (profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed) &&
2332- signin::IsUsernameAllowedByPatternFromPrefs(
2333- g_browser_process->local_state(), primary_account.email)) {
2334- return;
2335- }
2336
2337 #if BUILDFLAG(IS_CHROMEOS_LACROS)
2338 // Disabling signin in chrome and 'RestrictSigninToPattern' policy
2339--- a/chrome/browser/signin/primary_account_policy_manager.h
2340+++ b/chrome/browser/signin/primary_account_policy_manager.h
2341@@ -61,9 +61,6 @@ class PrimaryAccountPolicyManager : publ
2342
2343 raw_ptr<Profile> profile_;
2344
2345- // Helper object to listen for changes to the signin allowed preference.
2346- BooleanPrefMember signin_allowed_;
2347-
2348 // Helper object to listen for changes to signin preferences stored in non-
2349 // profile-specific local prefs (like kGoogleServicesUsernamePattern).
2350 PrefChangeRegistrar local_state_pref_registrar_;
2351--- a/chrome/browser/signin/primary_account_policy_manager_unittest.cc
2352+++ b/chrome/browser/signin/primary_account_policy_manager_unittest.cc
2353@@ -14,7 +14,6 @@
2354 #include "chrome/test/base/testing_browser_process.h"
2355 #include "chrome/test/base/testing_profile.h"
2356 #include "chrome/test/base/testing_profile_manager.h"
2357-#include "components/signin/public/base/signin_pref_names.h"
2358 #include "components/signin/public/identity_manager/identity_test_environment.h"
2359 #include "content/public/test/browser_task_environment.h"
2360 #include "testing/gtest/include/gtest/gtest.h"
2361--- a/chrome/browser/signin/signin_manager.cc
2362+++ b/chrome/browser/signin/signin_manager.cc
2363@@ -6,7 +6,6 @@
2364
2365 #include "base/bind.h"
2281 #include "components/prefs/pref_service.h" 2366 #include "components/prefs/pref_service.h"
2282-#include "components/signin/public/base/signin_pref_names.h" 2367-#include "components/signin/public/base/signin_pref_names.h"
2283 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" 2368 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
2284 #include "components/signin/public/identity_manager/identity_manager.h" 2369 #include "components/signin/public/identity_manager/identity_manager.h"
2285 #include "components/signin/public/identity_manager/primary_account_mutator.h" 2370 #include "components/signin/public/identity_manager/primary_account_mutator.h"
2286@@ -13,11 +12,6 @@ 2371@@ -21,11 +20,6 @@ SigninManager::SigninManager(PrefService
2287 SigninManager::SigninManager(PrefService* prefs, 2372 signin::IdentityManager* identity_manager,
2288 signin::IdentityManager* identity_manager) 2373 SigninClient* client)
2289 : prefs_(prefs), identity_manager_(identity_manager) { 2374 : prefs_(prefs), identity_manager_(identity_manager) {
2290- signin_allowed_.Init( 2375- signin_allowed_.Init(
2291- prefs::kSigninAllowed, prefs_, 2376- prefs::kSigninAllowed, prefs_,
2292- base::BindRepeating(&SigninManager::OnSigninAllowedPrefChanged, 2377- base::BindRepeating(&SigninManager::OnSigninAllowedPrefChanged,
2293- base::Unretained(this))); 2378- base::Unretained(this)));
2294- 2379-
2295 UpdateUnconsentedPrimaryAccount(); 2380 #if BUILDFLAG(IS_CHROMEOS_LACROS)
2296 identity_manager_->AddObserver(this); 2381 is_main_profile_ = client->GetInitialPrimaryAccount().has_value();
2297 } 2382 #endif
2298@@ -63,16 +57,6 @@ SigninManager::ComputeUnconsentedPrimary 2383@@ -128,16 +122,6 @@ CoreAccountInfo SigninManager::ComputeUn
2299 signin::ConsentLevel::kSync); 2384 signin::ConsentLevel::kSync);
2300 } 2385 }
2301 2386
@@ -2307,13 +2392,13 @@
2307- // It was considered simpler to keep the logic to update the unconsented 2392- // It was considered simpler to keep the logic to update the unconsented
2308- // primary account in a single place. 2393- // primary account in a single place.
2309- if (!signin_allowed_.GetValue()) 2394- if (!signin_allowed_.GetValue())
2310- return absl::nullopt; 2395- return CoreAccountInfo();
2311- 2396-
2312 signin::AccountsInCookieJarInfo cookie_info = 2397 signin::AccountsInCookieJarInfo cookie_info =
2313 identity_manager_->GetAccountsInCookieJar(); 2398 identity_manager_->GetAccountsInCookieJar();
2314 2399
2315--- chrome/browser/signin/signin_promo_util.cc.orig 2400--- a/chrome/browser/signin/signin_promo_util.cc
2316+++ chrome/browser/signin/signin_promo_util.cc 2401+++ b/chrome/browser/signin/signin_promo_util.cc
2317@@ -8,7 +8,6 @@ 2402@@ -8,7 +8,6 @@
2318 #include "chrome/browser/profiles/profile.h" 2403 #include "chrome/browser/profiles/profile.h"
2319 #include "chrome/browser/signin/identity_manager_factory.h" 2404 #include "chrome/browser/signin/identity_manager_factory.h"
@@ -2331,37 +2416,18 @@
2331 return false; 2416 return false;
2332 2417
2333 // Display the signin promo if the user is not signed in. 2418 // Display the signin promo if the user is not signed in.
2334--- chrome/browser/signin/signin_ui_util.cc.orig 2419--- a/chrome/browser/signin/signin_ui_util.cc
2335+++ chrome/browser/signin/signin_ui_util.cc 2420+++ b/chrome/browser/signin/signin_ui_util.cc
2336@@ -34,7 +34,6 @@ 2421@@ -39,7 +39,6 @@
2337 #include "components/feature_engagement/public/tracker.h"
2338 #include "components/prefs/pref_service.h" 2422 #include "components/prefs/pref_service.h"
2423 #include "components/signin/public/base/consent_level.h"
2339 #include "components/signin/public/base/signin_metrics.h" 2424 #include "components/signin/public/base/signin_metrics.h"
2340-#include "components/signin/public/base/signin_pref_names.h" 2425-#include "components/signin/public/base/signin_pref_names.h"
2341 #include "components/signin/public/identity_manager/account_info.h" 2426 #include "components/signin/public/identity_manager/account_info.h"
2342 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" 2427 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
2343 #include "components/signin/public/identity_manager/consent_level.h"
2344--- chrome/browser/signin/signin_util.cc.orig
2345+++ chrome/browser/signin/signin_util.cc
2346@@ -30,7 +30,6 @@
2347 #include "components/google/core/common/google_util.h"
2348 #include "components/prefs/pref_service.h"
2349 #include "components/signin/public/base/signin_metrics.h"
2350-#include "components/signin/public/base/signin_pref_names.h"
2351 #include "components/signin/public/identity_manager/identity_manager.h" 2428 #include "components/signin/public/identity_manager/identity_manager.h"
2352 #include "components/signin/public/identity_manager/identity_utils.h" 2429--- a/chrome/browser/signin/signin_util_win.cc
2353 #include "components/signin/public/identity_manager/primary_account_mutator.h" 2430+++ b/chrome/browser/signin/signin_util_win.cc
2354@@ -232,7 +231,7 @@ void EnsurePrimaryAccountAllowedForProfi
2355
2356 CoreAccountInfo primary_account =
2357 identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync);
2358- if (profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed) &&
2359+ if (false &&
2360 signin::IsUsernameAllowedByPatternFromPrefs(
2361 g_browser_process->local_state(), primary_account.email)) {
2362 return;
2363--- chrome/browser/signin/signin_util_win.cc.orig
2364+++ chrome/browser/signin/signin_util_win.cc
2365@@ -34,7 +34,6 @@ 2431@@ -34,7 +34,6 @@
2366 #include "components/prefs/pref_service.h" 2432 #include "components/prefs/pref_service.h"
2367 #include "components/signin/core/browser/about_signin_internals.h" 2433 #include "components/signin/core/browser/about_signin_internals.h"
@@ -2370,8 +2436,8 @@
2370 #include "components/signin/public/identity_manager/accounts_mutator.h" 2436 #include "components/signin/public/identity_manager/accounts_mutator.h"
2371 #include "components/signin/public/identity_manager/identity_manager.h" 2437 #include "components/signin/public/identity_manager/identity_manager.h"
2372 2438
2373@@ -136,9 +135,6 @@ void ImportCredentialsFromProvider(Profi 2439@@ -134,9 +133,6 @@ void ImportCredentialsFromProvider(Profi
2374 account_id, nullptr)); 2440 account_id, nullptr, profile));
2375 } 2441 }
2376 } 2442 }
2377- 2443-
@@ -2380,7 +2446,7 @@
2380 } 2446 }
2381 2447
2382 // Extracts the |cred_provider_gaia_id| and |cred_provider_email| for the user 2448 // Extracts the |cred_provider_gaia_id| and |cred_provider_email| for the user
2383@@ -313,20 +309,7 @@ bool ReauthWithCredentialProviderIfPossi 2449@@ -311,20 +307,7 @@ bool ReauthWithCredentialProviderIfPossi
2384 // - The profile is marked as having been signed in with a system credential. 2450 // - The profile is marked as having been signed in with a system credential.
2385 // - The profile is already signed in. 2451 // - The profile is already signed in.
2386 // - The profile is in an auth error state. 2452 // - The profile is in an auth error state.
@@ -2401,8 +2467,8 @@
2401 } 2467 }
2402 2468
2403 } // namespace signin_util 2469 } // namespace signin_util
2404--- chrome/browser/signin/signin_util_win_browsertest.cc.orig 2470--- a/chrome/browser/signin/signin_util_win_browsertest.cc
2405+++ chrome/browser/signin/signin_util_win_browsertest.cc 2471+++ b/chrome/browser/signin/signin_util_win_browsertest.cc
2406@@ -31,7 +31,6 @@ 2472@@ -31,7 +31,6 @@
2407 #include "chrome/test/base/in_process_browser_test.h" 2473 #include "chrome/test/base/in_process_browser_test.h"
2408 #include "chrome/test/base/testing_browser_process.h" 2474 #include "chrome/test/base/testing_browser_process.h"
@@ -2411,9 +2477,9 @@
2411 #include "components/signin/public/identity_manager/identity_manager.h" 2477 #include "components/signin/public/identity_manager/identity_manager.h"
2412 #include "components/signin/public/identity_manager/identity_test_utils.h" 2478 #include "components/signin/public/identity_manager/identity_test_utils.h"
2413 #include "components/signin/public/identity_manager/primary_account_mutator.h" 2479 #include "components/signin/public/identity_manager/primary_account_mutator.h"
2414--- chrome/browser/ssl/certificate_reporting_test_utils.cc.orig 2480--- a/chrome/browser/ssl/certificate_reporting_test_utils.cc
2415+++ chrome/browser/ssl/certificate_reporting_test_utils.cc 2481+++ b/chrome/browser/ssl/certificate_reporting_test_utils.cc
2416@@ -15,7 +15,6 @@ 2482@@ -14,7 +14,6 @@
2417 #include "build/build_config.h" 2483 #include "build/build_config.h"
2418 #include "chrome/browser/profiles/profile.h" 2484 #include "chrome/browser/profiles/profile.h"
2419 #include "components/prefs/pref_service.h" 2485 #include "components/prefs/pref_service.h"
@@ -2421,29 +2487,38 @@
2421 #include "components/security_interstitials/content/cert_report_helper.h" 2487 #include "components/security_interstitials/content/cert_report_helper.h"
2422 #include "components/security_interstitials/content/certificate_error_report.h" 2488 #include "components/security_interstitials/content/certificate_error_report.h"
2423 #include "components/variations/variations_associated_data.h" 2489 #include "components/variations/variations_associated_data.h"
2424--- chrome/browser/ssl/sct_reporting_service.cc.orig 2490--- a/chrome/browser/ssl/sct_reporting_service.cc
2425+++ chrome/browser/ssl/sct_reporting_service.cc 2491+++ b/chrome/browser/ssl/sct_reporting_service.cc
2426@@ -9,7 +9,6 @@ 2492@@ -12,7 +12,6 @@
2427 #include "chrome/browser/net/system_network_context_manager.h"
2428 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
2429 #include "chrome/common/chrome_features.h" 2493 #include "chrome/common/chrome_features.h"
2494 #include "chrome/common/pref_names.h"
2495 #include "components/prefs/pref_service.h"
2430-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 2496-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
2431 #include "content/public/browser/network_service_instance.h" 2497 #include "content/public/browser/network_service_instance.h"
2432 #include "content/public/browser/storage_partition.h" 2498 #include "content/public/browser/storage_partition.h"
2433 #include "net/traffic_annotation/network_traffic_annotation.h" 2499 #include "google_apis/google_api_keys.h"
2434@@ -119,8 +118,5 @@ void SCTReportingService::SetReportingEn 2500@@ -199,18 +198,6 @@ void SetSCTAuditingEnabledForStoragePart
2435 } 2501 } // namespace
2436 2502
2437 void SCTReportingService::OnPreferenceChanged() { 2503 network::mojom::SCTAuditingMode SCTReportingService::GetReportingMode() {
2438- const bool enabled = safe_browsing_service_ && 2504- if (profile_->IsOffTheRecord() ||
2439- safe_browsing_service_->enabled_by_prefs() && 2505- !base::FeatureList::IsEnabled(features::kSCTAuditing)) {
2440- safe_browsing::IsExtendedReportingEnabled(pref_service_); 2506- return network::mojom::SCTAuditingMode::kDisabled;
2441- SetReportingEnabled(enabled); 2507- }
2442+ SetReportingEnabled(false); 2508- if (safe_browsing::IsSafeBrowsingEnabled(pref_service_)) {
2509- if (safe_browsing::IsExtendedReportingEnabled(pref_service_)) {
2510- return network::mojom::SCTAuditingMode::kEnhancedSafeBrowsingReporting;
2511- }
2512- if (base::FeatureList::IsEnabled(features::kSCTAuditingHashdance)) {
2513- return network::mojom::SCTAuditingMode::kHashdance;
2514- }
2515- }
2516 return network::mojom::SCTAuditingMode::kDisabled;
2443 } 2517 }
2444--- chrome/browser/ssl/ssl_browsertest.cc.orig 2518
2445+++ chrome/browser/ssl/ssl_browsertest.cc 2519--- a/chrome/browser/ssl/ssl_browsertest.cc
2446@@ -94,7 +94,6 @@ 2520+++ b/chrome/browser/ssl/ssl_browsertest.cc
2521@@ -93,7 +93,6 @@
2447 #include "components/policy/policy_constants.h" 2522 #include "components/policy/policy_constants.h"
2448 #include "components/prefs/testing_pref_service.h" 2523 #include "components/prefs/testing_pref_service.h"
2449 #include "components/safe_browsing/core/common/features.h" 2524 #include "components/safe_browsing/core/common/features.h"
@@ -2451,9 +2526,9 @@
2451 #include "components/security_interstitials/content/bad_clock_blocking_page.h" 2526 #include "components/security_interstitials/content/bad_clock_blocking_page.h"
2452 #include "components/security_interstitials/content/captive_portal_blocking_page.h" 2527 #include "components/security_interstitials/content/captive_portal_blocking_page.h"
2453 #include "components/security_interstitials/content/cert_report_helper.h" 2528 #include "components/security_interstitials/content/cert_report_helper.h"
2454--- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2529--- a/chrome/browser/ssl/ssl_error_controller_client.cc
2455+++ chrome/browser/ssl/ssl_error_controller_client.cc 2530+++ b/chrome/browser/ssl/ssl_error_controller_client.cc
2456@@ -23,7 +23,6 @@ 2531@@ -22,7 +22,6 @@
2457 #include "chrome/browser/ssl/stateful_ssl_host_state_delegate_factory.h" 2532 #include "chrome/browser/ssl/stateful_ssl_host_state_delegate_factory.h"
2458 #include "chrome/common/pref_names.h" 2533 #include "chrome/common/pref_names.h"
2459 #include "chrome/common/url_constants.h" 2534 #include "chrome/common/url_constants.h"
@@ -2461,17 +2536,17 @@
2461 #include "components/security_interstitials/content/content_metrics_helper.h" 2536 #include "components/security_interstitials/content/content_metrics_helper.h"
2462 #include "components/security_interstitials/content/settings_page_helper.h" 2537 #include "components/security_interstitials/content/settings_page_helper.h"
2463 #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" 2538 #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
2464--- chrome/browser/supervised_user/supervised_user_pref_store.cc.orig 2539--- a/chrome/browser/supervised_user/supervised_user_pref_store.cc
2465+++ chrome/browser/supervised_user/supervised_user_pref_store.cc 2540+++ b/chrome/browser/supervised_user/supervised_user_pref_store.cc
2466@@ -23,7 +23,6 @@ 2541@@ -25,7 +25,6 @@
2467 #include "chrome/common/pref_names.h" 2542 #include "chrome/common/pref_names.h"
2468 #include "components/feed/core/shared_prefs/pref_names.h" 2543 #include "components/feed/core/shared_prefs/pref_names.h"
2469 #include "components/prefs/pref_value_map.h" 2544 #include "components/prefs/pref_value_map.h"
2470-#include "components/signin/public/base/signin_pref_names.h" 2545-#include "components/signin/public/base/signin_pref_names.h"
2546 #include "components/signin/public/base/signin_switches.h"
2471 #include "extensions/buildflags/buildflags.h" 2547 #include "extensions/buildflags/buildflags.h"
2472 2548
2473 namespace { 2549@@ -58,10 +57,6 @@ SupervisedUserSettingsPrefMappingEntry k
2474@@ -55,10 +54,6 @@ SupervisedUserSettingsPrefMappingEntry k
2475 prefs::kSupervisedUserSafeSites, 2550 prefs::kSupervisedUserSafeSites,
2476 }, 2551 },
2477 { 2552 {
@@ -2482,7 +2557,7 @@
2482 supervised_users::kUserName, 2557 supervised_users::kUserName,
2483 prefs::kProfileName, 2558 prefs::kProfileName,
2484 }, 2559 },
2485@@ -124,7 +119,6 @@ void SupervisedUserPrefStore::OnNewSetti 2560@@ -127,7 +122,6 @@ void SupervisedUserPrefStore::OnNewSetti
2486 prefs_->SetInteger(prefs::kForceYouTubeRestrict, 2561 prefs_->SetInteger(prefs::kForceYouTubeRestrict,
2487 safe_search_util::YOUTUBE_RESTRICT_MODERATE); 2562 safe_search_util::YOUTUBE_RESTRICT_MODERATE);
2488 prefs_->SetBoolean(prefs::kHideWebStoreIcon, false); 2563 prefs_->SetBoolean(prefs::kHideWebStoreIcon, false);
@@ -2490,8 +2565,8 @@
2490 prefs_->SetBoolean(feed::prefs::kEnableSnippets, false); 2565 prefs_->SetBoolean(feed::prefs::kEnableSnippets, false);
2491 2566
2492 // Copy supervised user settings to prefs. 2567 // Copy supervised user settings to prefs.
2493--- chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc.orig 2568--- a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
2494+++ chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc 2569+++ b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
2495@@ -37,7 +37,6 @@ 2570@@ -37,7 +37,6 @@
2496 #include "components/autofill/core/common/autofill_features.h" 2571 #include "components/autofill/core/common/autofill_features.h"
2497 #include "components/autofill/core/common/autofill_payments_features.h" 2572 #include "components/autofill/core/common/autofill_payments_features.h"
@@ -2500,8 +2575,8 @@
2500 #include "components/signin/public/identity_manager/identity_manager.h" 2575 #include "components/signin/public/identity_manager/identity_manager.h"
2501 #include "components/strings/grit/components_strings.h" 2576 #include "components/strings/grit/components_strings.h"
2502 #include "components/sync/driver/sync_service.h" 2577 #include "components/sync/driver/sync_service.h"
2503--- chrome/browser/ui/browser_command_controller.cc.orig 2578--- a/chrome/browser/ui/browser_command_controller.cc
2504+++ chrome/browser/ui/browser_command_controller.cc 2579+++ b/chrome/browser/ui/browser_command_controller.cc
2505@@ -57,7 +57,6 @@ 2580@@ -57,7 +57,6 @@
2506 #include "components/prefs/pref_service.h" 2581 #include "components/prefs/pref_service.h"
2507 #include "components/sessions/core/tab_restore_service.h" 2582 #include "components/sessions/core/tab_restore_service.h"
@@ -2510,7 +2585,7 @@
2510 #include "content/public/browser/native_web_keyboard_event.h" 2585 #include "content/public/browser/native_web_keyboard_event.h"
2511 #include "content/public/browser/navigation_controller.h" 2586 #include "content/public/browser/navigation_controller.h"
2512 #include "content/public/browser/navigation_entry.h" 2587 #include "content/public/browser/navigation_entry.h"
2513@@ -184,10 +183,6 @@ BrowserCommandController::BrowserCommand 2588@@ -214,10 +213,6 @@ BrowserCommandController::BrowserCommand
2514 &BrowserCommandController::UpdateCommandsForFullscreenMode, 2589 &BrowserCommandController::UpdateCommandsForFullscreenMode,
2515 base::Unretained(this))); 2590 base::Unretained(this)));
2516 #endif 2591 #endif
@@ -2521,7 +2596,7 @@
2521 2596
2522 InitCommandState(); 2597 InitCommandState();
2523 2598
2524@@ -1526,7 +1521,7 @@ void BrowserCommandController::UpdateSho 2599@@ -1611,7 +1606,7 @@ void BrowserCommandController::UpdateSho
2525 return; 2600 return;
2526 2601
2527 command_updater_.UpdateCommandEnabled( 2602 command_updater_.UpdateCommandEnabled(
@@ -2529,10 +2604,10 @@
2529+ IDC_SHOW_SIGNIN, false); 2604+ IDC_SHOW_SIGNIN, false);
2530 } 2605 }
2531 2606
2532 // static 2607 void BrowserCommandController::UpdateReloadStopState(bool is_loading,
2533--- chrome/browser/ui/browser_command_controller.h.orig 2608--- a/chrome/browser/ui/browser_command_controller.h
2534+++ chrome/browser/ui/browser_command_controller.h 2609+++ b/chrome/browser/ui/browser_command_controller.h
2535@@ -211,7 +211,6 @@ class BrowserCommandController : public 2610@@ -212,7 +212,6 @@ class BrowserCommandController : public
2536 2611
2537 PrefChangeRegistrar profile_pref_registrar_; 2612 PrefChangeRegistrar profile_pref_registrar_;
2538 PrefChangeRegistrar local_pref_registrar_; 2613 PrefChangeRegistrar local_pref_registrar_;
@@ -2540,8 +2615,8 @@
2540 2615
2541 // In locked fullscreen mode disallow enabling/disabling commands. 2616 // In locked fullscreen mode disallow enabling/disabling commands.
2542 bool is_locked_fullscreen_ = false; 2617 bool is_locked_fullscreen_ = false;
2543--- chrome/browser/ui/browser_command_controller_unittest.cc.orig 2618--- a/chrome/browser/ui/browser_command_controller_unittest.cc
2544+++ chrome/browser/ui/browser_command_controller_unittest.cc 2619+++ b/chrome/browser/ui/browser_command_controller_unittest.cc
2545@@ -27,7 +27,6 @@ 2620@@ -27,7 +27,6 @@
2546 #include "chrome/test/base/test_browser_window.h" 2621 #include "chrome/test/base/test_browser_window.h"
2547 #include "chrome/test/base/testing_browser_process.h" 2622 #include "chrome/test/base/testing_browser_process.h"
@@ -2550,17 +2625,17 @@
2550 #include "content/public/browser/native_web_keyboard_event.h" 2625 #include "content/public/browser/native_web_keyboard_event.h"
2551 #include "ui/events/keycodes/dom/dom_code.h" 2626 #include "ui/events/keycodes/dom/dom_code.h"
2552 #include "ui/events/keycodes/keyboard_codes.h" 2627 #include "ui/events/keycodes/keyboard_codes.h"
2553--- chrome/browser/ui/chrome_pages.cc.orig 2628--- a/chrome/browser/ui/chrome_pages.cc
2554+++ chrome/browser/ui/chrome_pages.cc 2629+++ b/chrome/browser/ui/chrome_pages.cc
2555@@ -61,7 +61,6 @@ 2630@@ -64,7 +64,6 @@
2556 2631 #if !BUILDFLAG(IS_ANDROID)
2557 #if !defined(OS_ANDROID) 2632 #include "base/metrics/histogram_functions.h"
2558 #include "chrome/browser/signin/identity_manager_factory.h" 2633 #include "chrome/browser/signin/identity_manager_factory.h"
2559-#include "components/signin/public/base/signin_pref_names.h" 2634-#include "components/signin/public/base/signin_pref_names.h"
2560 #include "components/signin/public/identity_manager/identity_manager.h" 2635 #include "components/signin/public/identity_manager/identity_manager.h"
2561 #endif 2636 #endif
2562 2637
2563@@ -484,13 +483,7 @@ void ShowBrowserSignin(Browser* browser, 2638@@ -524,13 +523,7 @@ void ShowBrowserSignin(Browser* browser,
2564 2639
2565 void ShowBrowserSigninOrSettings(Browser* browser, 2640 void ShowBrowserSigninOrSettings(Browser* browser,
2566 signin_metrics::AccessPoint access_point) { 2641 signin_metrics::AccessPoint access_point) {
@@ -2575,18 +2650,18 @@
2575 } 2650 }
2576 #endif 2651 #endif
2577 2652
2578--- chrome/browser/ui/hats/trust_safety_sentiment_service.cc.orig 2653--- a/chrome/browser/ui/hats/trust_safety_sentiment_service.cc
2579+++ chrome/browser/ui/hats/trust_safety_sentiment_service.cc 2654+++ b/chrome/browser/ui/hats/trust_safety_sentiment_service.cc
2580@@ -19,8 +19,6 @@ 2655@@ -22,8 +22,6 @@
2581 #include "components/content_settings/core/common/pref_names.h"
2582 #include "components/password_manager/core/common/password_manager_pref_names.h" 2656 #include "components/password_manager/core/common/password_manager_pref_names.h"
2583 #include "components/prefs/pref_service.h" 2657 #include "components/prefs/pref_service.h"
2658 #include "components/privacy_sandbox/privacy_sandbox_prefs.h"
2584-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 2659-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
2585-#include "components/signin/public/base/signin_pref_names.h" 2660-#include "components/signin/public/base/signin_pref_names.h"
2586 #include "components/unified_consent/pref_names.h" 2661 #include "components/unified_consent/pref_names.h"
2662 #include "components/version_info/channel.h"
2587 2663
2588 namespace { 2664@@ -128,9 +126,6 @@ bool HasNonDefaultPrivacySetting(Profile
2589@@ -81,9 +79,6 @@ bool HasNonDefaultPrivacySetting(Profile
2590 auto* prefs = profile->GetPrefs(); 2665 auto* prefs = profile->GetPrefs();
2591 2666
2592 std::vector<std::string> prefs_to_check = { 2667 std::vector<std::string> prefs_to_check = {
@@ -2596,7 +2671,7 @@
2596 prefs::kEnableDoNotTrack, 2671 prefs::kEnableDoNotTrack,
2597 password_manager::prefs::kPasswordLeakDetectionEnabled, 2672 password_manager::prefs::kPasswordLeakDetectionEnabled,
2598 prefs::kCookieControlsMode, 2673 prefs::kCookieControlsMode,
2599@@ -101,13 +96,9 @@ bool HasNonDefaultPrivacySetting(Profile 2674@@ -148,13 +143,9 @@ bool HasNonDefaultPrivacySetting(Profile
2600 // Users consenting to sync automatically enable UKM collection 2675 // Users consenting to sync automatically enable UKM collection
2601 auto* ukm_pref = prefs->FindPreference( 2676 auto* ukm_pref = prefs->FindPreference(
2602 unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled); 2677 unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled);
@@ -2611,9 +2686,9 @@
2611 2686
2612 // Check the default value for each user facing content setting. Note that 2687 // Check the default value for each user facing content setting. Note that
2613 // this will not include content setting exceptions set via permission 2688 // this will not include content setting exceptions set via permission
2614--- chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc.orig 2689--- a/chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc
2615+++ chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc 2690+++ b/chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc
2616@@ -20,7 +20,6 @@ 2691@@ -19,7 +19,6 @@
2617 #include "components/password_manager/core/browser/password_manager_metrics_util.h" 2692 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
2618 #include "components/safe_browsing/content/browser/password_protection/password_protection_test_util.h" 2693 #include "components/safe_browsing/content/browser/password_protection/password_protection_test_util.h"
2619 #include "components/safe_browsing/core/browser/password_protection/metrics_util.h" 2694 #include "components/safe_browsing/core/browser/password_protection/metrics_util.h"
@@ -2621,36 +2696,36 @@
2621 #include "components/signin/public/identity_manager/account_info.h" 2696 #include "components/signin/public/identity_manager/account_info.h"
2622 #include "components/signin/public/identity_manager/identity_manager.h" 2697 #include "components/signin/public/identity_manager/identity_manager.h"
2623 #include "components/signin/public/identity_manager/identity_test_utils.h" 2698 #include "components/signin/public/identity_manager/identity_test_utils.h"
2624--- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig 2699--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
2625+++ chrome/browser/ui/views/profiles/profile_menu_view.cc 2700+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
2626@@ -53,7 +53,6 @@ 2701@@ -53,7 +53,6 @@
2627 #include "chrome/grit/generated_resources.h"
2628 #include "chrome/grit/theme_resources.h" 2702 #include "chrome/grit/theme_resources.h"
2629 #include "components/signin/core/browser/signin_error_controller.h" 2703 #include "components/signin/core/browser/signin_error_controller.h"
2704 #include "components/signin/public/base/consent_level.h"
2630-#include "components/signin/public/base/signin_pref_names.h" 2705-#include "components/signin/public/base/signin_pref_names.h"
2631 #include "components/signin/public/identity_manager/consent_level.h"
2632 #include "components/signin/public/identity_manager/primary_account_mutator.h" 2706 #include "components/signin/public/identity_manager/primary_account_mutator.h"
2633 #include "components/strings/grit/components_strings.h" 2707 #include "components/strings/grit/components_strings.h"
2634@@ -501,7 +500,6 @@ void ProfileMenuView::BuildAutofillButto 2708 #include "components/vector_icons/vector_icons.h"
2709@@ -508,7 +507,6 @@ void ProfileMenuView::BuildAutofillButto
2635 2710
2636 void ProfileMenuView::BuildSyncInfo() { 2711 void ProfileMenuView::BuildSyncInfo() {
2637 Profile* profile = browser()->profile(); 2712 Profile* profile = browser()->profile();
2638- if (!profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed)) 2713- if (!profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed))
2639 return; 2714 return;
2640 2715
2641 signin::IdentityManager* identity_manager = 2716 if (!SyncServiceFactory::IsSyncAllowed(profile)) {
2642--- chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc.orig 2717--- a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
2643+++ chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc 2718+++ b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
2644@@ -55,7 +55,6 @@ 2719@@ -60,7 +60,6 @@
2645 #include "components/feature_engagement/public/tracker.h" 2720 #include "components/google/core/common/google_util.h"
2646 #include "components/feature_engagement/test/test_tracker.h"
2647 #include "components/prefs/pref_service.h" 2721 #include "components/prefs/pref_service.h"
2722 #include "components/signin/public/base/consent_level.h"
2648-#include "components/signin/public/base/signin_pref_names.h" 2723-#include "components/signin/public/base/signin_pref_names.h"
2649 #include "components/signin/public/identity_manager/consent_level.h"
2650 #include "components/signin/public/identity_manager/identity_test_utils.h" 2724 #include "components/signin/public/identity_manager/identity_test_utils.h"
2651 #include "components/sync/driver/sync_service.h" 2725 #include "components/sync/driver/sync_service.h"
2652--- chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc.orig 2726 #include "components/sync/driver/sync_user_settings.h"
2653+++ chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc 2727--- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
2728+++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
2654@@ -122,7 +122,6 @@ PasswordReuseModalWarningDialog::Passwor 2729@@ -122,7 +122,6 @@ PasswordReuseModalWarningDialog::Passwor
2655 OnWarningDone done_callback) 2730 OnWarningDone done_callback)
2656 : content::WebContentsObserver(web_contents), 2731 : content::WebContentsObserver(web_contents),
@@ -2692,19 +2767,19 @@
2692 LogModalWarningDialogLifetime(modal_construction_start_time_); 2767 LogModalWarningDialogLifetime(modal_construction_start_time_);
2693 } 2768 }
2694 2769
2695--- chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h.orig 2770--- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h
2696+++ chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h 2771+++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h
2697@@ -60,7 +60,6 @@ class PasswordReuseModalWarningDialog 2772@@ -62,7 +62,6 @@ class PasswordReuseModalWarningDialog
2698 2773
2699 private: 2774 private:
2700 OnWarningDone done_callback_; 2775 OnWarningDone done_callback_;
2701- ChromePasswordProtectionService* service_; 2776- raw_ptr<ChromePasswordProtectionService> service_;
2702 const GURL url_; 2777 const GURL url_;
2703 const ReusedPasswordAccountType password_type_; 2778 const ReusedPasswordAccountType password_type_;
2704 2779
2705--- chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc.orig 2780--- a/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc
2706+++ chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc 2781+++ b/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc
2707@@ -44,7 +44,6 @@ 2782@@ -46,7 +46,6 @@
2708 #include "components/keyed_service/content/browser_context_dependency_manager.h" 2783 #include "components/keyed_service/content/browser_context_dependency_manager.h"
2709 #include "components/prefs/pref_service.h" 2784 #include "components/prefs/pref_service.h"
2710 #include "components/prefs/scoped_user_pref_update.h" 2785 #include "components/prefs/scoped_user_pref_update.h"
@@ -2712,9 +2787,9 @@
2712 #include "components/signin/public/identity_manager/identity_test_utils.h" 2787 #include "components/signin/public/identity_manager/identity_test_utils.h"
2713 #include "content/public/browser/render_frame_host.h" 2788 #include "content/public/browser/render_frame_host.h"
2714 #include "content/public/browser/render_process_host.h" 2789 #include "content/public/browser/render_process_host.h"
2715--- chrome/browser/ui/webui/browser_command/browser_command_handler.cc.orig 2790--- a/chrome/browser/ui/webui/browser_command/browser_command_handler.cc
2716+++ chrome/browser/ui/webui/browser_command/browser_command_handler.cc 2791+++ b/chrome/browser/ui/webui/browser_command/browser_command_handler.cc
2717@@ -16,7 +16,6 @@ 2792@@ -17,7 +17,6 @@
2718 #include "chrome/common/webui_url_constants.h" 2793 #include "chrome/common/webui_url_constants.h"
2719 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" 2794 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
2720 #include "components/safe_browsing/core/common/safe_browsing_policy_handler.h" 2795 #include "components/safe_browsing/core/common/safe_browsing_policy_handler.h"
@@ -2723,8 +2798,8 @@
2723 #include "ui/base/window_open_disposition.h" 2798 #include "ui/base/window_open_disposition.h"
2724 2799
2725@@ -61,13 +60,6 @@ void BrowserCommandHandler::CanExecuteCo 2800@@ -61,13 +60,6 @@ void BrowserCommandHandler::CanExecuteCo
2726 can_execute = 2801 case Command::kOpenSafetyCheck:
2727 !chrome::enterprise_util::HasBrowserPoliciesApplied(profile_); 2802 can_execute = !chrome::enterprise_util::IsBrowserManaged(profile_);
2728 break; 2803 break;
2729- case Command::kOpenSafeBrowsingEnhancedProtectionSettings: { 2804- case Command::kOpenSafeBrowsingEnhancedProtectionSettings: {
2730- bool managed = safe_browsing::SafeBrowsingPolicyHandler:: 2805- bool managed = safe_browsing::SafeBrowsingPolicyHandler::
@@ -2736,8 +2811,8 @@
2736 case Command::kOpenFeedbackForm: 2811 case Command::kOpenFeedbackForm:
2737 can_execute = true; 2812 can_execute = true;
2738 break; 2813 break;
2739--- chrome/browser/ui/webui/downloads/downloads_dom_handler.cc.orig 2814--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
2740+++ chrome/browser/ui/webui/downloads/downloads_dom_handler.cc 2815+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
2741@@ -37,7 +37,6 @@ 2816@@ -37,7 +37,6 @@
2742 #include "chrome/common/url_constants.h" 2817 #include "chrome/common/url_constants.h"
2743 #include "components/download/public/common/download_item.h" 2818 #include "components/download/public/common/download_item.h"
@@ -2746,9 +2821,28 @@
2746 #include "content/public/browser/browser_thread.h" 2821 #include "content/public/browser/browser_thread.h"
2747 #include "content/public/browser/download_manager.h" 2822 #include "content/public/browser/download_manager.h"
2748 #include "content/public/browser/render_process_host.h" 2823 #include "content/public/browser/render_process_host.h"
2749--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2824--- a/chrome/browser/ui/webui/history/history_ui.cc
2750+++ chrome/browser/ui/webui/management/management_ui_handler.cc 2825+++ b/chrome/browser/ui/webui/history/history_ui.cc
2751@@ -29,7 +29,6 @@ 2826@@ -41,7 +41,6 @@
2827 #include "components/history_clusters/core/history_clusters_prefs.h"
2828 #include "components/history_clusters/core/history_clusters_service.h"
2829 #include "components/prefs/pref_service.h"
2830-#include "components/signin/public/base/signin_pref_names.h"
2831 #include "components/signin/public/identity_manager/identity_manager.h"
2832 #include "components/strings/grit/components_strings.h"
2833 #include "content/public/browser/web_ui.h"
2834@@ -124,8 +123,6 @@ content::WebUIDataSource* CreateHistoryU
2835 source->AddBoolean("allowDeletingHistory", allow_deleting_history);
2836
2837 source->AddBoolean("isGuestSession", profile->IsGuestSession());
2838- source->AddBoolean("isSignInAllowed",
2839- prefs->GetBoolean(prefs::kSigninAllowed));
2840
2841 source->AddBoolean(kIsUserSignedInKey, IsUserSignedIn(profile));
2842
2843--- a/chrome/browser/ui/webui/management/management_ui_handler.cc
2844+++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
2845@@ -30,7 +30,6 @@
2752 #include "chrome/browser/profiles/profile.h" 2846 #include "chrome/browser/profiles/profile.h"
2753 #include "chrome/browser/ui/managed_ui.h" 2847 #include "chrome/browser/ui/managed_ui.h"
2754 #include "chrome/common/pref_names.h" 2848 #include "chrome/common/pref_names.h"
@@ -2756,8 +2850,8 @@
2756 #include "components/strings/grit/components_strings.h" 2850 #include "components/strings/grit/components_strings.h"
2757 #include "content/public/browser/storage_partition.h" 2851 #include "content/public/browser/storage_partition.h"
2758 #include "content/public/browser/web_contents.h" 2852 #include "content/public/browser/web_contents.h"
2759--- chrome/browser/ui/webui/profile_info_watcher.cc.orig 2853--- a/chrome/browser/ui/webui/profile_info_watcher.cc
2760+++ chrome/browser/ui/webui/profile_info_watcher.cc 2854+++ b/chrome/browser/ui/webui/profile_info_watcher.cc
2761@@ -12,7 +12,6 @@ 2855@@ -12,7 +12,6 @@
2762 #include "chrome/browser/signin/identity_manager_factory.h" 2856 #include "chrome/browser/signin/identity_manager_factory.h"
2763 #include "chrome/common/pref_names.h" 2857 #include "chrome/common/pref_names.h"
@@ -2778,8 +2872,8 @@
2778 } 2872 }
2779 2873
2780 ProfileInfoWatcher::~ProfileInfoWatcher() { 2874 ProfileInfoWatcher::~ProfileInfoWatcher() {
2781--- chrome/browser/ui/webui/profile_info_watcher.h.orig 2875--- a/chrome/browser/ui/webui/profile_info_watcher.h
2782+++ chrome/browser/ui/webui/profile_info_watcher.h 2876+++ b/chrome/browser/ui/webui/profile_info_watcher.h
2783@@ -49,7 +49,6 @@ class ProfileInfoWatcher : public Profil 2877@@ -49,7 +49,6 @@ class ProfileInfoWatcher : public Profil
2784 // Called when the authenticated username changes. 2878 // Called when the authenticated username changes.
2785 base::RepeatingClosure callback_; 2879 base::RepeatingClosure callback_;
@@ -2788,9 +2882,9 @@
2788 }; 2882 };
2789 2883
2790 #endif // CHROME_BROWSER_UI_WEBUI_PROFILE_INFO_WATCHER_H_ 2884 #endif // CHROME_BROWSER_UI_WEBUI_PROFILE_INFO_WATCHER_H_
2791--- chrome/browser/ui/webui/reset_password/reset_password_ui.cc.orig 2885--- a/chrome/browser/ui/webui/reset_password/reset_password_ui.cc
2792+++ chrome/browser/ui/webui/reset_password/reset_password_ui.cc 2886+++ b/chrome/browser/ui/webui/reset_password/reset_password_ui.cc
2793@@ -17,7 +17,6 @@ 2887@@ -20,7 +20,6 @@
2794 #include "components/safe_browsing/content/browser/password_protection/password_protection_service.h" 2888 #include "components/safe_browsing/content/browser/password_protection/password_protection_service.h"
2795 #include "components/safe_browsing/core/browser/password_protection/metrics_util.h" 2889 #include "components/safe_browsing/core/browser/password_protection/metrics_util.h"
2796 #include "components/safe_browsing/core/common/proto/csd.pb.h" 2890 #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -2798,17 +2892,17 @@
2798 #include "components/strings/grit/components_strings.h" 2892 #include "components/strings/grit/components_strings.h"
2799 #include "components/url_formatter/url_formatter.h" 2893 #include "components/url_formatter/url_formatter.h"
2800 #include "components/user_prefs/user_prefs.h" 2894 #include "components/user_prefs/user_prefs.h"
2801--- chrome/browser/ui/webui/settings/people_handler.cc.orig 2895--- a/chrome/browser/ui/webui/settings/people_handler.cc
2802+++ chrome/browser/ui/webui/settings/people_handler.cc 2896+++ b/chrome/browser/ui/webui/settings/people_handler.cc
2803@@ -41,7 +41,6 @@ 2897@@ -42,7 +42,6 @@
2804 #include "components/prefs/pref_service.h"
2805 #include "components/signin/core/browser/signin_error_controller.h" 2898 #include "components/signin/core/browser/signin_error_controller.h"
2899 #include "components/signin/public/base/consent_level.h"
2806 #include "components/signin/public/base/signin_metrics.h" 2900 #include "components/signin/public/base/signin_metrics.h"
2807-#include "components/signin/public/base/signin_pref_names.h" 2901-#include "components/signin/public/base/signin_pref_names.h"
2808 #include "components/signin/public/identity_manager/accounts_mutator.h" 2902 #include "components/signin/public/identity_manager/accounts_mutator.h"
2809 #include "components/signin/public/identity_manager/consent_level.h"
2810 #include "components/signin/public/identity_manager/identity_manager.h" 2903 #include "components/signin/public/identity_manager/identity_manager.h"
2811@@ -290,10 +289,6 @@ void PeopleHandler::RegisterMessages() { 2904 #include "components/signin/public/identity_manager/primary_account_mutator.h"
2905@@ -301,10 +300,6 @@ void PeopleHandler::RegisterMessages() {
2812 void PeopleHandler::OnJavascriptAllowed() { 2906 void PeopleHandler::OnJavascriptAllowed() {
2813 PrefService* prefs = profile_->GetPrefs(); 2907 PrefService* prefs = profile_->GetPrefs();
2814 profile_pref_registrar_.Init(prefs); 2908 profile_pref_registrar_.Init(prefs);
@@ -2819,8 +2913,8 @@
2819 2913
2820 signin::IdentityManager* identity_manager( 2914 signin::IdentityManager* identity_manager(
2821 IdentityManagerFactory::GetInstance()->GetForProfile(profile_)); 2915 IdentityManagerFactory::GetInstance()->GetForProfile(profile_));
2822--- chrome/browser/ui/webui/settings/safety_check_handler.cc.orig 2916--- a/chrome/browser/ui/webui/settings/safety_check_handler.cc
2823+++ chrome/browser/ui/webui/settings/safety_check_handler.cc 2917+++ b/chrome/browser/ui/webui/settings/safety_check_handler.cc
2824@@ -28,7 +28,6 @@ 2918@@ -28,7 +28,6 @@
2825 #include "chrome/grit/chromium_strings.h" 2919 #include "chrome/grit/chromium_strings.h"
2826 #include "chrome/grit/generated_resources.h" 2920 #include "chrome/grit/generated_resources.h"
@@ -2829,22 +2923,20 @@
2829 #include "components/strings/grit/components_strings.h" 2923 #include "components/strings/grit/components_strings.h"
2830 #include "components/version_info/version_info.h" 2924 #include "components/version_info/version_info.h"
2831 #include "content/public/browser/browser_context.h" 2925 #include "content/public/browser/browser_context.h"
2832--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2926--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
2833+++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc 2927+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
2834@@ -67,7 +67,6 @@ 2928@@ -66,7 +66,6 @@
2835 #include "components/password_manager/core/browser/manage_passwords_referrer.h"
2836 #include "components/password_manager/core/common/password_manager_features.h" 2929 #include "components/password_manager/core/common/password_manager_features.h"
2837 #include "components/prefs/pref_service.h" 2930 #include "components/prefs/pref_service.h"
2931 #include "components/privacy_sandbox/privacy_sandbox_features.h"
2838-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 2932-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
2839 #include "components/signin/public/base/signin_buildflags.h" 2933 #include "components/signin/public/base/signin_buildflags.h"
2840 #include "components/strings/grit/components_chromium_strings.h" 2934 #include "components/strings/grit/components_chromium_strings.h"
2841 #include "components/strings/grit/components_strings.h" 2935 #include "components/strings/grit/components_strings.h"
2842@@ -1391,46 +1390,6 @@ void AddPrivacyStrings(content::WebUIDat 2936@@ -1473,44 +1472,6 @@ void AddPrivacyStrings(content::WebUIDat
2843 {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA}, 2937 {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
2844 {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION}, 2938 {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
2845 {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT}, 2939 {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT},
2846- {"safeBrowsingEnableExtendedReporting",
2847- IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING},
2848- {"safeBrowsingEnableExtendedReportingDesc", 2940- {"safeBrowsingEnableExtendedReportingDesc",
2849- IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC}, 2941- IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC},
2850- {"safeBrowsingEnhanced", IDS_SETTINGS_SAFEBROWSING_ENHANCED}, 2942- {"safeBrowsingEnhanced", IDS_SETTINGS_SAFEBROWSING_ENHANCED},
@@ -2886,7 +2978,7 @@
2886 {"safeBrowsingSectionLabel", IDS_SETTINGS_SAFEBROWSING_SECTION_LABEL}, 2978 {"safeBrowsingSectionLabel", IDS_SETTINGS_SAFEBROWSING_SECTION_LABEL},
2887 {"syncAndGoogleServicesPrivacyDescription", 2979 {"syncAndGoogleServicesPrivacyDescription",
2888 IDS_SETTINGS_SYNC_AND_GOOGLE_SERVICES_PRIVACY_DESC_UNIFIED_CONSENT}, 2980 IDS_SETTINGS_SYNC_AND_GOOGLE_SERVICES_PRIVACY_DESC_UNIFIED_CONSENT},
2889@@ -2626,11 +2585,6 @@ void AddSiteSettingsStrings(content::Web 2981@@ -2811,11 +2772,6 @@ void AddSiteSettingsStrings(content::Web
2890 html_source->AddLocalizedStrings(kSensorsLocalizedStrings); 2982 html_source->AddLocalizedStrings(kSensorsLocalizedStrings);
2891 2983
2892 html_source->AddBoolean( 2984 html_source->AddBoolean(
@@ -2898,19 +2990,19 @@
2898 "enableBlockAutoplayContentSetting", 2990 "enableBlockAutoplayContentSetting",
2899 base::FeatureList::IsEnabled(media::kAutoplayDisableSettings)); 2991 base::FeatureList::IsEnabled(media::kAutoplayDisableSettings));
2900 2992
2901--- chrome/browser/ui/webui/settings/settings_ui.cc.orig 2993--- a/chrome/browser/ui/webui/settings/settings_ui.cc
2902+++ chrome/browser/ui/webui/settings/settings_ui.cc 2994+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
2903@@ -72,7 +72,6 @@ 2995@@ -71,7 +71,6 @@
2904 #include "components/pref_registry/pref_registry_syncable.h" 2996 #include "components/pref_registry/pref_registry_syncable.h"
2905 #include "components/prefs/pref_service.h" 2997 #include "components/prefs/pref_service.h"
2906 #include "components/safe_browsing/core/common/features.h" 2998 #include "components/safe_browsing/core/common/features.h"
2907-#include "components/signin/public/base/signin_pref_names.h" 2999-#include "components/signin/public/base/signin_pref_names.h"
3000 #include "components/signin/public/base/signin_switches.h"
2908 #include "content/public/browser/url_data_source.h" 3001 #include "content/public/browser/url_data_source.h"
2909 #include "content/public/browser/web_contents.h" 3002 #include "content/public/browser/web_contents.h"
2910 #include "content/public/browser/web_ui.h" 3003@@ -258,9 +257,7 @@ SettingsUI::SettingsUI(content::WebUI* w
2911@@ -274,9 +273,7 @@ SettingsUI::SettingsUI(content::WebUI* w 3004 std::make_unique<IncompatibleApplicationsHandler>());
2912 ? "enable-branding-update" 3005 #endif // BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
2913 : "");
2914 3006
2915- html_source->AddBoolean("signinAllowed", !profile->IsGuestSession() && 3007- html_source->AddBoolean("signinAllowed", !profile->IsGuestSession() &&
2916- profile->GetPrefs()->GetBoolean( 3008- profile->GetPrefs()->GetBoolean(
@@ -2919,38 +3011,8 @@
2919 3011
2920 html_source->AddBoolean("showImportPasswords", 3012 html_source->AddBoolean("showImportPasswords",
2921 base::FeatureList::IsEnabled( 3013 base::FeatureList::IsEnabled(
2922--- chrome/browser/ui/webui/signin/dice_turn_sync_on_helper.cc.orig 3014--- a/chrome/browser/ui/webui/signin/inline_login_handler.cc
2923+++ chrome/browser/ui/webui/signin/dice_turn_sync_on_helper.cc 3015+++ b/chrome/browser/ui/webui/signin/inline_login_handler.cc
2924@@ -46,7 +46,6 @@
2925 #include "components/policy/core/common/management/management_service.h"
2926 #include "components/prefs/pref_service.h"
2927 #include "components/signin/public/base/signin_metrics.h"
2928-#include "components/signin/public/base/signin_pref_names.h"
2929 #include "components/signin/public/identity_manager/accounts_mutator.h"
2930 #include "components/signin/public/identity_manager/identity_manager.h"
2931 #include "components/signin/public/identity_manager/primary_account_mutator.h"
2932@@ -248,8 +247,7 @@ DiceTurnSyncOnHelper::DiceTurnSyncOnHelp
2933 // last authenticated account of the current profile, then Chrome will show a
2934 // confirmation dialog before starting sync.
2935 // TODO(skym): Warn for high risk upgrade scenario (https://crbug.com/572754).
2936- std::string last_email =
2937- profile_->GetPrefs()->GetString(prefs::kGoogleServicesLastUsername);
2938+ std::string last_email;
2939 delegate_->ShowMergeSyncDataConfirmation(
2940 last_email, account_info_.email,
2941 base::BindOnce(&DiceTurnSyncOnHelper::OnMergeAccountConfirmation,
2942--- chrome/browser/ui/webui/signin/dice_turn_sync_on_helper_unittest.cc.orig
2943+++ chrome/browser/ui/webui/signin/dice_turn_sync_on_helper_unittest.cc
2944@@ -38,7 +38,6 @@
2945 #include "components/prefs/pref_service.h"
2946 #include "components/signin/public/base/account_consistency_method.h"
2947 #include "components/signin/public/base/signin_metrics.h"
2948-#include "components/signin/public/base/signin_pref_names.h"
2949 #include "components/signin/public/identity_manager/identity_manager.h"
2950 #include "components/signin/public/identity_manager/identity_test_environment.h"
2951 #include "components/signin/public/identity_manager/primary_account_mutator.h"
2952--- chrome/browser/ui/webui/signin/inline_login_handler.cc.orig
2953+++ chrome/browser/ui/webui/signin/inline_login_handler.cc
2954@@ -27,7 +27,6 @@ 3016@@ -27,7 +27,6 @@
2955 #include "chrome/common/pref_names.h" 3017 #include "chrome/common/pref_names.h"
2956 #include "components/metrics/metrics_pref_names.h" 3018 #include "components/metrics/metrics_pref_names.h"
@@ -2959,7 +3021,7 @@
2959 #include "content/public/browser/storage_partition.h" 3021 #include "content/public/browser/storage_partition.h"
2960 #include "content/public/browser/web_contents.h" 3022 #include "content/public/browser/web_contents.h"
2961 #include "content/public/browser/web_ui.h" 3023 #include "content/public/browser/web_ui.h"
2962@@ -127,8 +126,6 @@ void InlineLoginHandler::ContinueHandleI 3024@@ -138,8 +137,6 @@ void InlineLoginHandler::ContinueHandleI
2963 std::string default_email; 3025 std::string default_email;
2964 if (reason == signin_metrics::Reason::kSigninPrimaryAccount || 3026 if (reason == signin_metrics::Reason::kSigninPrimaryAccount ||
2965 reason == signin_metrics::Reason::kForcedSigninPrimaryAccount) { 3027 reason == signin_metrics::Reason::kForcedSigninPrimaryAccount) {
@@ -2968,9 +3030,9 @@
2968 } else { 3030 } else {
2969 if (!net::GetValueForKeyInQuery(current_url, "email", &default_email)) 3031 if (!net::GetValueForKeyInQuery(current_url, "email", &default_email))
2970 default_email.clear(); 3032 default_email.clear();
2971--- chrome/browser/ui/webui/signin/inline_login_handler_impl.cc.orig 3033--- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
2972+++ chrome/browser/ui/webui/signin/inline_login_handler_impl.cc 3034+++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
2973@@ -70,7 +70,6 @@ 3035@@ -67,7 +67,6 @@
2974 #include "components/prefs/pref_service.h" 3036 #include "components/prefs/pref_service.h"
2975 #include "components/signin/core/browser/about_signin_internals.h" 3037 #include "components/signin/core/browser/about_signin_internals.h"
2976 #include "components/signin/public/base/signin_metrics.h" 3038 #include "components/signin/public/base/signin_metrics.h"
@@ -2978,9 +3040,9 @@
2978 #include "components/signin/public/identity_manager/account_info.h" 3040 #include "components/signin/public/identity_manager/account_info.h"
2979 #include "components/signin/public/identity_manager/accounts_cookie_mutator.h" 3041 #include "components/signin/public/identity_manager/accounts_cookie_mutator.h"
2980 #include "components/signin/public/identity_manager/accounts_mutator.h" 3042 #include "components/signin/public/identity_manager/accounts_mutator.h"
2981--- chrome/browser/ui/webui/signin/signin_error_ui.cc.orig 3043--- a/chrome/browser/ui/webui/signin/signin_error_ui.cc
2982+++ chrome/browser/ui/webui/signin/signin_error_ui.cc 3044+++ b/chrome/browser/ui/webui/signin/signin_error_ui.cc
2983@@ -23,7 +23,6 @@ 3045@@ -27,7 +27,6 @@
2984 #include "chrome/grit/generated_resources.h" 3046 #include "chrome/grit/generated_resources.h"
2985 #include "chrome/grit/signin_resources.h" 3047 #include "chrome/grit/signin_resources.h"
2986 #include "components/prefs/pref_service.h" 3048 #include "components/prefs/pref_service.h"
@@ -2988,7 +3050,7 @@
2988 #include "components/strings/grit/components_strings.h" 3050 #include "components/strings/grit/components_strings.h"
2989 #include "content/public/browser/web_ui.h" 3051 #include "content/public/browser/web_ui.h"
2990 #include "content/public/browser/web_ui_data_source.h" 3052 #include "content/public/browser/web_ui_data_source.h"
2991@@ -115,9 +114,7 @@ void SigninErrorUI::Initialize(Browser* 3053@@ -119,9 +118,7 @@ void SigninErrorUI::Initialize(Browser*
2992 if (is_profile_blocked) { 3054 if (is_profile_blocked) {
2993 source->AddLocalizedString("profileBlockedMessage", 3055 source->AddLocalizedString("profileBlockedMessage",
2994 IDS_OLD_PROFILES_DISABLED_MESSAGE); 3056 IDS_OLD_PROFILES_DISABLED_MESSAGE);
@@ -2999,8 +3061,8 @@
2999 if (allowed_domain.empty()) { 3061 if (allowed_domain.empty()) {
3000 source->AddLocalizedString( 3062 source->AddLocalizedString(
3001 "profileBlockedAddPersonSuggestion", 3063 "profileBlockedAddPersonSuggestion",
3002--- chrome/browser/ui/webui/signin/signin_utils_desktop.cc.orig 3064--- a/chrome/browser/ui/webui/signin/signin_utils_desktop.cc
3003+++ chrome/browser/ui/webui/signin/signin_utils_desktop.cc 3065+++ b/chrome/browser/ui/webui/signin/signin_utils_desktop.cc
3004@@ -18,7 +18,6 @@ 3066@@ -18,7 +18,6 @@
3005 #include "chrome/grit/chromium_strings.h" 3067 #include "chrome/grit/chromium_strings.h"
3006 #include "chrome/grit/generated_resources.h" 3068 #include "chrome/grit/generated_resources.h"
@@ -3028,8 +3090,38 @@
3028 return SigninUIError::ProfileWasUsedByAnotherAccount(email, last_email); 3090 return SigninUIError::ProfileWasUsedByAnotherAccount(email, last_email);
3029 } 3091 }
3030 } 3092 }
3031--- chrome/browser/ui/webui/welcome/welcome_ui.cc.orig 3093--- a/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc
3032+++ chrome/browser/ui/webui/welcome/welcome_ui.cc 3094+++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc
3095@@ -47,7 +47,6 @@
3096 #include "components/policy/core/common/management/management_service.h"
3097 #include "components/prefs/pref_service.h"
3098 #include "components/signin/public/base/signin_metrics.h"
3099-#include "components/signin/public/base/signin_pref_names.h"
3100 #include "components/signin/public/identity_manager/accounts_mutator.h"
3101 #include "components/signin/public/identity_manager/identity_manager.h"
3102 #include "components/signin/public/identity_manager/primary_account_mutator.h"
3103@@ -226,8 +225,7 @@ TurnSyncOnHelper::TurnSyncOnHelper(
3104 // last authenticated account of the current profile, then Chrome will show a
3105 // confirmation dialog before starting sync.
3106 // TODO(skym): Warn for high risk upgrade scenario (https://crbug.com/572754).
3107- std::string last_email =
3108- profile_->GetPrefs()->GetString(prefs::kGoogleServicesLastUsername);
3109+ std::string last_email;
3110 delegate_->ShowMergeSyncDataConfirmation(
3111 last_email, account_info_.email,
3112 base::BindOnce(&TurnSyncOnHelper::OnMergeAccountConfirmation,
3113--- a/chrome/browser/ui/webui/signin/turn_sync_on_helper_unittest.cc
3114+++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper_unittest.cc
3115@@ -46,7 +46,6 @@
3116 #include "components/signin/public/base/account_consistency_method.h"
3117 #include "components/signin/public/base/consent_level.h"
3118 #include "components/signin/public/base/signin_metrics.h"
3119-#include "components/signin/public/base/signin_pref_names.h"
3120 #include "components/signin/public/base/signin_switches.h"
3121 #include "components/signin/public/identity_manager/identity_manager.h"
3122 #include "components/signin/public/identity_manager/identity_test_environment.h"
3123--- a/chrome/browser/ui/webui/welcome/welcome_ui.cc
3124+++ b/chrome/browser/ui/webui/welcome/welcome_ui.cc
3033@@ -24,7 +24,6 @@ 3125@@ -24,7 +24,6 @@
3034 #include "chrome/grit/welcome_resources.h" 3126 #include "chrome/grit/welcome_resources.h"
3035 #include "chrome/grit/welcome_resources_map.h" 3127 #include "chrome/grit/welcome_resources_map.h"
@@ -3047,8 +3139,8 @@
3047 html_source->SetRequestFilter( 3139 html_source->SetRequestFilter(
3048 base::BindRepeating(&ShouldHandleRequestCallback, 3140 base::BindRepeating(&ShouldHandleRequestCallback,
3049 weak_ptr_factory_.GetWeakPtr()), 3141 weak_ptr_factory_.GetWeakPtr()),
3050--- chrome/browser/unified_consent/unified_consent_service_factory.cc.orig 3142--- a/chrome/browser/unified_consent/unified_consent_service_factory.cc
3051+++ chrome/browser/unified_consent/unified_consent_service_factory.cc 3143+++ b/chrome/browser/unified_consent/unified_consent_service_factory.cc
3052@@ -13,7 +13,6 @@ 3144@@ -13,7 +13,6 @@
3053 #include "components/embedder_support/pref_names.h" 3145 #include "components/embedder_support/pref_names.h"
3054 #include "components/keyed_service/content/browser_context_dependency_manager.h" 3146 #include "components/keyed_service/content/browser_context_dependency_manager.h"
@@ -3063,10 +3155,10 @@
3063 prefs::kSearchSuggestEnabled, embedder_support::kAlternateErrorPagesEnabled, 3155 prefs::kSearchSuggestEnabled, embedder_support::kAlternateErrorPagesEnabled,
3064- prefs::kSafeBrowsingEnabled, prefs::kSafeBrowsingScoutReportingEnabled, 3156- prefs::kSafeBrowsingEnabled, prefs::kSafeBrowsingScoutReportingEnabled,
3065 spellcheck::prefs::kSpellCheckUseSpellingService, 3157 spellcheck::prefs::kSpellCheckUseSpellingService,
3066 #if defined(OS_ANDROID) 3158 #if BUILDFLAG(IS_ANDROID)
3067 prefs::kContextualSearchEnabled 3159 prefs::kContextualSearchEnabled
3068--- chrome/common/extensions/api/privacy.json.orig 3160--- a/chrome/common/extensions/api/privacy.json
3069+++ chrome/common/extensions/api/privacy.json 3161+++ b/chrome/common/extensions/api/privacy.json
3070@@ -63,16 +63,6 @@ 3162@@ -63,16 +63,6 @@
3071 "value": ["passwordSavingEnabled", {"type":"boolean"}], 3163 "value": ["passwordSavingEnabled", {"type":"boolean"}],
3072 "description": "If enabled, the password manager will ask if you want to save passwords. This preference's value is a boolean, defaulting to <code>true</code>." 3164 "description": "If enabled, the password manager will ask if you want to save passwords. This preference's value is a boolean, defaulting to <code>true</code>."
@@ -3084,9 +3176,9 @@
3084 "searchSuggestEnabled": { 3176 "searchSuggestEnabled": {
3085 "$ref": "types.ChromeSetting", 3177 "$ref": "types.ChromeSetting",
3086 "value": ["searchSuggestEnabled", {"type":"boolean"}], 3178 "value": ["searchSuggestEnabled", {"type":"boolean"}],
3087--- components/password_manager/core/browser/leak_detection_delegate.cc.orig 3179--- a/components/password_manager/core/browser/leak_detection_delegate.cc
3088+++ components/password_manager/core/browser/leak_detection_delegate.cc 3180+++ b/components/password_manager/core/browser/leak_detection_delegate.cc
3089@@ -22,7 +22,6 @@ 3181@@ -23,7 +23,6 @@
3090 #include "components/password_manager/core/common/password_manager_features.h" 3182 #include "components/password_manager/core/common/password_manager_features.h"
3091 #include "components/password_manager/core/common/password_manager_pref_names.h" 3183 #include "components/password_manager/core/common/password_manager_pref_names.h"
3092 #include "components/prefs/pref_service.h" 3184 #include "components/prefs/pref_service.h"
@@ -3094,7 +3186,7 @@
3094 #include "services/network/public/cpp/shared_url_loader_factory.h" 3186 #include "services/network/public/cpp/shared_url_loader_factory.h"
3095 3187
3096 namespace password_manager { 3188 namespace password_manager {
3097@@ -169,28 +168,7 @@ void LeakDetectionDelegate::OnError(Leak 3189@@ -176,28 +175,7 @@ void LeakDetectionDelegate::OnError(Leak
3098 3190
3099 bool CanStartLeakCheck(const PrefService& prefs, 3191 bool CanStartLeakCheck(const PrefService& prefs,
3100 const PasswordManagerClient* client) { 3192 const PasswordManagerClient* client) {
@@ -3124,18 +3216,18 @@
3124 } 3216 }
3125 3217
3126 } // namespace password_manager 3218 } // namespace password_manager
3127--- components/password_manager/core/browser/password_bubble_experiment.cc.orig 3219--- a/components/password_manager/core/browser/password_bubble_experiment.cc
3128+++ components/password_manager/core/browser/password_bubble_experiment.cc 3220+++ b/components/password_manager/core/browser/password_bubble_experiment.cc
3129@@ -18,7 +18,6 @@ 3221@@ -18,7 +18,6 @@
3130 #include "components/prefs/pref_registry_simple.h" 3222 #include "components/prefs/pref_registry_simple.h"
3131 #include "components/prefs/pref_service.h" 3223 #include "components/prefs/pref_service.h"
3132 #include "components/signin/public/base/signin_buildflags.h" 3224 #include "components/signin/public/base/signin_buildflags.h"
3133-#include "components/signin/public/base/signin_pref_names.h" 3225-#include "components/signin/public/base/signin_pref_names.h"
3226 #include "components/sync/base/user_selectable_type.h"
3134 #include "components/sync/driver/sync_service.h" 3227 #include "components/sync/driver/sync_service.h"
3135 #include "components/sync/driver/sync_user_settings.h" 3228 #include "components/sync/driver/sync_user_settings.h"
3136 3229--- a/components/password_manager/core/browser/password_reuse_detector.cc
3137--- components/password_manager/core/browser/password_reuse_detector.cc.orig 3230+++ b/components/password_manager/core/browser/password_reuse_detector.cc
3138+++ components/password_manager/core/browser/password_reuse_detector.cc
3139@@ -15,7 +15,6 @@ 3231@@ -15,7 +15,6 @@
3140 #include "components/password_manager/core/browser/password_reuse_detector_consumer.h" 3232 #include "components/password_manager/core/browser/password_reuse_detector_consumer.h"
3141 #include "components/password_manager/core/browser/password_store_consumer.h" 3233 #include "components/password_manager/core/browser/password_store_consumer.h"
@@ -3144,7 +3236,7 @@
3144 #include "google_apis/gaia/gaia_auth_util.h" 3236 #include "google_apis/gaia/gaia_auth_util.h"
3145 #include "google_apis/gaia/gaia_urls.h" 3237 #include "google_apis/gaia/gaia_urls.h"
3146 #include "url/origin.h" 3238 #include "url/origin.h"
3147@@ -205,9 +204,7 @@ PasswordReuseDetector::CheckNonGaiaEnter 3239@@ -216,9 +215,7 @@ PasswordReuseDetector::CheckNonGaiaEnter
3148 // Skips password reuse check if |domain| matches enterprise login URL or 3240 // Skips password reuse check if |domain| matches enterprise login URL or
3149 // enterprise change password URL. 3241 // enterprise change password URL.
3150 GURL page_url(domain); 3242 GURL page_url(domain);
@@ -3155,8 +3247,8 @@
3155 return absl::nullopt; 3247 return absl::nullopt;
3156 } 3248 }
3157 3249
3158--- components/password_manager/core/browser/password_reuse_manager_impl.cc.orig 3250--- a/components/password_manager/core/browser/password_reuse_manager_impl.cc
3159+++ components/password_manager/core/browser/password_reuse_manager_impl.cc 3251+++ b/components/password_manager/core/browser/password_reuse_manager_impl.cc
3160@@ -9,7 +9,6 @@ 3252@@ -9,7 +9,6 @@
3161 #include "components/password_manager/core/browser/password_store_signin_notifier.h" 3253 #include "components/password_manager/core/browser/password_store_signin_notifier.h"
3162 #include "components/password_manager/core/common/password_manager_features.h" 3254 #include "components/password_manager/core/common/password_manager_features.h"
@@ -3165,7 +3257,7 @@
3165 3257
3166 namespace password_manager { 3258 namespace password_manager {
3167 3259
3168@@ -318,20 +317,6 @@ void PasswordReuseManagerImpl::ScheduleP 3260@@ -320,20 +319,6 @@ void PasswordReuseManagerImpl::ScheduleP
3169 3261
3170 void PasswordReuseManagerImpl::ScheduleEnterprisePasswordURLUpdate() { 3262 void PasswordReuseManagerImpl::ScheduleEnterprisePasswordURLUpdate() {
3171 DCHECK(main_task_runner_->RunsTasksInCurrentSequence()); 3263 DCHECK(main_task_runner_->RunsTasksInCurrentSequence());
@@ -3186,9 +3278,9 @@
3186 } 3278 }
3187 3279
3188 void PasswordReuseManagerImpl::OnGetPasswordStoreResults( 3280 void PasswordReuseManagerImpl::OnGetPasswordStoreResults(
3189--- components/password_manager/core/browser/password_store.cc.orig 3281--- a/components/password_manager/core/browser/password_store.cc
3190+++ components/password_manager/core/browser/password_store.cc 3282+++ b/components/password_manager/core/browser/password_store.cc
3191@@ -39,7 +39,6 @@ 3283@@ -40,7 +40,6 @@
3192 #include "components/password_manager/core/common/password_manager_features.h" 3284 #include "components/password_manager/core/common/password_manager_features.h"
3193 #include "components/password_manager/core/common/password_manager_pref_names.h" 3285 #include "components/password_manager/core/common/password_manager_pref_names.h"
3194 #include "components/prefs/pref_service.h" 3286 #include "components/prefs/pref_service.h"
@@ -3196,8 +3288,8 @@
3196 #include "components/sync/model/proxy_model_type_controller_delegate.h" 3288 #include "components/sync/model/proxy_model_type_controller_delegate.h"
3197 3289
3198 namespace password_manager { 3290 namespace password_manager {
3199--- components/password_manager/core/browser/password_sync_util.cc.orig 3291--- a/components/password_manager/core/browser/password_sync_util.cc
3200+++ components/password_manager/core/browser/password_sync_util.cc 3292+++ b/components/password_manager/core/browser/password_sync_util.cc
3201@@ -8,7 +8,6 @@ 3293@@ -8,7 +8,6 @@
3202 #include "build/build_config.h" 3294 #include "build/build_config.h"
3203 #include "components/password_manager/core/browser/password_form.h" 3295 #include "components/password_manager/core/browser/password_form.h"
@@ -3218,9 +3310,9 @@
3218 return false; 3310 return false;
3219 } 3311 }
3220 3312
3221--- components/password_manager/core/browser/sync_credentials_filter_unittest.cc.orig 3313--- a/components/password_manager/core/browser/sync_credentials_filter_unittest.cc
3222+++ components/password_manager/core/browser/sync_credentials_filter_unittest.cc 3314+++ b/components/password_manager/core/browser/sync_credentials_filter_unittest.cc
3223@@ -29,7 +29,6 @@ 3315@@ -30,7 +30,6 @@
3224 #include "components/password_manager/core/common/password_manager_features.h" 3316 #include "components/password_manager/core/common/password_manager_features.h"
3225 #include "components/prefs/pref_registry_simple.h" 3317 #include "components/prefs/pref_registry_simple.h"
3226 #include "components/prefs/testing_pref_service.h" 3318 #include "components/prefs/testing_pref_service.h"
@@ -3228,8 +3320,18 @@
3228 #include "testing/gtest/include/gtest/gtest.h" 3320 #include "testing/gtest/include/gtest/gtest.h"
3229 3321
3230 namespace password_manager { 3322 namespace password_manager {
3231--- components/safe_browsing/content/browser/base_blocking_page.cc.orig 3323--- a/components/reputation/core/safety_tips_config.cc
3232+++ components/safe_browsing/content/browser/base_blocking_page.cc 3324+++ b/components/reputation/core/safety_tips_config.cc
3325@@ -5,6 +5,7 @@
3326 #include "components/reputation/core/safety_tips_config.h"
3327
3328 #include "base/no_destructor.h"
3329+#include "base/notreached.h"
3330 #include "base/ranges/algorithm.h"
3331 #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
3332 #include "third_party/re2/src/re2/re2.h"
3333--- a/components/safe_browsing/content/browser/base_blocking_page.cc
3334+++ b/components/safe_browsing/content/browser/base_blocking_page.cc
3233@@ -13,7 +13,6 @@ 3335@@ -13,7 +13,6 @@
3234 #include "base/time/time.h" 3336 #include "base/time/time.h"
3235 #include "components/safe_browsing/content/browser/safe_browsing_controller_client.h" 3337 #include "components/safe_browsing/content/browser/safe_browsing_controller_client.h"
@@ -3238,9 +3340,9 @@
3238 #include "components/security_interstitials/content/security_interstitial_controller_client.h" 3340 #include "components/security_interstitials/content/security_interstitial_controller_client.h"
3239 #include "components/security_interstitials/content/settings_page_helper.h" 3341 #include "components/security_interstitials/content/settings_page_helper.h"
3240 #include "components/security_interstitials/content/unsafe_resource_util.h" 3342 #include "components/security_interstitials/content/unsafe_resource_util.h"
3241--- components/safe_browsing/content/browser/client_side_detection_service.cc.orig 3343--- a/components/safe_browsing/content/browser/client_side_detection_service.cc
3242+++ components/safe_browsing/content/browser/client_side_detection_service.cc 3344+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
3243@@ -28,7 +28,6 @@ 3345@@ -27,7 +27,6 @@
3244 #include "components/safe_browsing/core/common/features.h" 3346 #include "components/safe_browsing/core/common/features.h"
3245 #include "components/safe_browsing/core/common/proto/client_model.pb.h" 3347 #include "components/safe_browsing/core/common/proto/client_model.pb.h"
3246 #include "components/safe_browsing/core/common/proto/csd.pb.h" 3348 #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -3248,8 +3350,8 @@
3248 #include "components/safe_browsing/core/common/safebrowsing_constants.h" 3350 #include "components/safe_browsing/core/common/safebrowsing_constants.h"
3249 #include "components/safe_browsing/core/common/utils.h" 3351 #include "components/safe_browsing/core/common/utils.h"
3250 #include "content/public/browser/browser_task_traits.h" 3352 #include "content/public/browser/browser_task_traits.h"
3251--- components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.cc.orig 3353--- a/components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.cc
3252+++ components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.cc 3354+++ b/components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.cc
3253@@ -20,7 +20,6 @@ 3355@@ -20,7 +20,6 @@
3254 #include "components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager_util.h" 3356 #include "components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager_util.h"
3255 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" 3357 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
@@ -3257,8 +3359,8 @@
3257-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 3359-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
3258 #include "components/safe_browsing/core/common/utils.h" 3360 #include "components/safe_browsing/core/common/utils.h"
3259 #include "components/sessions/content/session_tab_helper.h" 3361 #include "components/sessions/content/session_tab_helper.h"
3260 #include "content/public/browser/navigation_details.h" 3362 #include "content/public/browser/browser_context.h"
3261@@ -306,7 +305,7 @@ GURL SafeBrowsingNavigationObserverManag 3363@@ -339,7 +338,7 @@ GURL SafeBrowsingNavigationObserverManag
3262 bool SafeBrowsingNavigationObserverManager::IsEnabledAndReady( 3364 bool SafeBrowsingNavigationObserverManager::IsEnabledAndReady(
3263 PrefService* prefs, 3365 PrefService* prefs,
3264 bool has_safe_browsing_service) { 3366 bool has_safe_browsing_service) {
@@ -3267,8 +3369,8 @@
3267 } 3369 }
3268 3370
3269 // static 3371 // static
3270--- components/safe_browsing/content/browser/triggers/suspicious_site_trigger_unittest.cc.orig 3372--- a/components/safe_browsing/content/browser/triggers/suspicious_site_trigger_unittest.cc
3271+++ components/safe_browsing/content/browser/triggers/suspicious_site_trigger_unittest.cc 3373+++ b/components/safe_browsing/content/browser/triggers/suspicious_site_trigger_unittest.cc
3272@@ -11,7 +11,6 @@ 3374@@ -11,7 +11,6 @@
3273 #include "build/build_config.h" 3375 #include "build/build_config.h"
3274 #include "components/prefs/testing_pref_service.h" 3376 #include "components/prefs/testing_pref_service.h"
@@ -3277,9 +3379,9 @@
3277 #include "content/public/test/browser_task_environment.h" 3379 #include "content/public/test/browser_task_environment.h"
3278 #include "content/public/test/navigation_simulator.h" 3380 #include "content/public/test/navigation_simulator.h"
3279 #include "content/public/test/test_renderer_host.h" 3381 #include "content/public/test/test_renderer_host.h"
3280--- components/safe_browsing/content/browser/triggers/trigger_manager.cc.orig 3382--- a/components/safe_browsing/content/browser/triggers/trigger_manager.cc
3281+++ components/safe_browsing/content/browser/triggers/trigger_manager.cc 3383+++ b/components/safe_browsing/content/browser/triggers/trigger_manager.cc
3282@@ -12,7 +12,6 @@ 3384@@ -13,7 +13,6 @@
3283 #include "components/safe_browsing/content/browser/base_ui_manager.h" 3385 #include "components/safe_browsing/content/browser/base_ui_manager.h"
3284 #include "components/safe_browsing/content/browser/threat_details.h" 3386 #include "components/safe_browsing/content/browser/threat_details.h"
3285 #include "components/safe_browsing/core/common/features.h" 3387 #include "components/safe_browsing/core/common/features.h"
@@ -3287,7 +3389,7 @@
3287 #include "components/security_interstitials/core/unsafe_resource.h" 3389 #include "components/security_interstitials/core/unsafe_resource.h"
3288 #include "content/public/browser/browser_context.h" 3390 #include "content/public/browser/browser_context.h"
3289 #include "content/public/browser/browser_thread.h" 3391 #include "content/public/browser/browser_thread.h"
3290@@ -85,16 +84,16 @@ SBErrorOptions TriggerManager::GetSBErro 3392@@ -86,16 +85,16 @@ SBErrorOptions TriggerManager::GetSBErro
3291 const PrefService& pref_service, 3393 const PrefService& pref_service,
3292 content::WebContents* web_contents) { 3394 content::WebContents* web_contents) {
3293 return SBErrorOptions(/*is_main_frame_load_blocked=*/false, 3395 return SBErrorOptions(/*is_main_frame_load_blocked=*/false,
@@ -3310,14 +3412,14 @@
3310 /*help_center_article_link=*/std::string()); 3412 /*help_center_article_link=*/std::string());
3311 } 3413 }
3312 3414
3313--- components/safe_browsing/content/browser/triggers/trigger_throttler.cc.orig 3415--- a/components/safe_browsing/content/browser/triggers/trigger_throttler.cc
3314+++ components/safe_browsing/content/browser/triggers/trigger_throttler.cc 3416+++ b/components/safe_browsing/content/browser/triggers/trigger_throttler.cc
3315@@ -197,28 +197,6 @@ void TriggerThrottler::LoadTriggerEvents 3417@@ -197,28 +197,6 @@ void TriggerThrottler::LoadTriggerEvents
3316 trigger_events_.clear(); 3418 trigger_events_.clear();
3317 if (!local_state_prefs_) 3419 if (!local_state_prefs_)
3318 return; 3420 return;
3319- 3421-
3320- const base::DictionaryValue* event_dict = local_state_prefs_->GetDictionary( 3422- const base::Value* event_dict = local_state_prefs_->GetDictionary(
3321- prefs::kSafeBrowsingTriggerEventTimestamps); 3423- prefs::kSafeBrowsingTriggerEventTimestamps);
3322- for (auto trigger_pair : event_dict->DictItems()) { 3424- for (auto trigger_pair : event_dict->DictItems()) {
3323- // Check that the first item in the pair is convertible to a trigger type 3425- // Check that the first item in the pair is convertible to a trigger type
@@ -3332,7 +3434,7 @@
3332- continue; 3434- continue;
3333- 3435-
3334- const TriggerType trigger_type = static_cast<TriggerType>(trigger_type_int); 3436- const TriggerType trigger_type = static_cast<TriggerType>(trigger_type_int);
3335- for (const auto& timestamp : trigger_pair.second.GetList()) { 3437- for (const auto& timestamp : trigger_pair.second.GetListDeprecated()) {
3336- if (timestamp.is_double()) 3438- if (timestamp.is_double())
3337- trigger_events_[trigger_type].push_back( 3439- trigger_events_[trigger_type].push_back(
3338- base::Time::FromDoubleT(timestamp.GetDouble())); 3440- base::Time::FromDoubleT(timestamp.GetDouble()));
@@ -3351,8 +3453,8 @@
3351 } 3453 }
3352 3454
3353 size_t TriggerThrottler::GetDailyQuotaForTrigger( 3455 size_t TriggerThrottler::GetDailyQuotaForTrigger(
3354--- components/safe_browsing/content/browser/triggers/trigger_throttler_unittest.cc.orig 3456--- a/components/safe_browsing/content/browser/triggers/trigger_throttler_unittest.cc
3355+++ components/safe_browsing/content/browser/triggers/trigger_throttler_unittest.cc 3457+++ b/components/safe_browsing/content/browser/triggers/trigger_throttler_unittest.cc
3356@@ -9,7 +9,6 @@ 3458@@ -9,7 +9,6 @@
3357 #include "base/test/simple_test_clock.h" 3459 #include "base/test/simple_test_clock.h"
3358 #include "components/prefs/testing_pref_service.h" 3460 #include "components/prefs/testing_pref_service.h"
@@ -3361,9 +3463,9 @@
3361 #include "testing/gmock/include/gmock/gmock.h" 3463 #include "testing/gmock/include/gmock/gmock.h"
3362 #include "testing/gtest/include/gtest/gtest.h" 3464 #include "testing/gtest/include/gtest/gtest.h"
3363 3465
3364--- components/safe_browsing/content/browser/ui_manager.cc.orig 3466--- a/components/safe_browsing/content/browser/ui_manager.cc
3365+++ components/safe_browsing/content/browser/ui_manager.cc 3467+++ b/components/safe_browsing/content/browser/ui_manager.cc
3366@@ -18,7 +18,6 @@ 3468@@ -17,7 +17,6 @@
3367 #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" 3469 #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
3368 #include "components/safe_browsing/core/browser/ping_manager.h" 3470 #include "components/safe_browsing/core/browser/ping_manager.h"
3369 #include "components/safe_browsing/core/common/features.h" 3471 #include "components/safe_browsing/core/common/features.h"
@@ -3371,9 +3473,9 @@
3371 #include "components/security_interstitials/content/security_interstitial_tab_helper.h" 3473 #include "components/security_interstitials/content/security_interstitial_tab_helper.h"
3372 #include "components/security_interstitials/content/unsafe_resource_util.h" 3474 #include "components/security_interstitials/content/unsafe_resource_util.h"
3373 #include "components/security_interstitials/core/unsafe_resource.h" 3475 #include "components/security_interstitials/core/unsafe_resource.h"
3374--- components/safe_browsing/content/browser/ui_manager_unittest.cc.orig 3476--- a/components/safe_browsing/content/browser/ui_manager_unittest.cc
3375+++ components/safe_browsing/content/browser/ui_manager_unittest.cc 3477+++ b/components/safe_browsing/content/browser/ui_manager_unittest.cc
3376@@ -14,7 +14,6 @@ 3478@@ -15,7 +15,6 @@
3377 #include "components/safe_browsing/content/browser/safe_browsing_controller_client.h" 3479 #include "components/safe_browsing/content/browser/safe_browsing_controller_client.h"
3378 #include "components/safe_browsing/content/browser/ui_manager.h" 3480 #include "components/safe_browsing/content/browser/ui_manager.h"
3379 #include "components/safe_browsing/core/browser/db/util.h" 3481 #include "components/safe_browsing/core/browser/db/util.h"
@@ -3381,38 +3483,38 @@
3381 #include "components/security_interstitials/content/security_interstitial_controller_client.h" 3483 #include "components/security_interstitials/content/security_interstitial_controller_client.h"
3382 #include "components/security_interstitials/content/settings_page_helper.h" 3484 #include "components/security_interstitials/content/settings_page_helper.h"
3383 #include "components/security_interstitials/content/unsafe_resource_util.h" 3485 #include "components/security_interstitials/content/unsafe_resource_util.h"
3384--- components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc.orig 3486--- a/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc
3385+++ components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc 3487+++ b/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc
3386@@ -32,7 +32,6 @@ 3488@@ -32,7 +32,6 @@
3387 #include "components/safe_browsing/core/browser/referrer_chain_provider.h" 3489 #include "components/safe_browsing/core/browser/referrer_chain_provider.h"
3388 #include "components/safe_browsing/core/common/features.h" 3490 #include "components/safe_browsing/core/common/features.h"
3389 #include "components/safe_browsing/core/common/proto/csd.pb.h" 3491 #include "components/safe_browsing/core/common/proto/csd.pb.h"
3390-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 3492-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
3493 #include "content/public/browser/global_routing_id.h"
3391 #include "services/network/public/mojom/cookie_manager.mojom.h" 3494 #include "services/network/public/mojom/cookie_manager.mojom.h"
3392 #if BUILDFLAG(FULL_SAFE_BROWSING) 3495 #if BUILDFLAG(FULL_SAFE_BROWSING)
3393 #include "components/enterprise/common/proto/connectors.pb.h" 3496@@ -2050,18 +2049,13 @@ void SafeBrowsingUIHandler::GetPrefs(con
3394@@ -2035,18 +2034,13 @@ void SafeBrowsingUIHandler::GetPrefs(con
3395 AllowJavascript(); 3497 AllowJavascript();
3396 DCHECK(!args->GetList().empty()); 3498 DCHECK(!args.empty());
3397 std::string callback_id = args->GetList()[0].GetString(); 3499 std::string callback_id = args[0].GetString();
3398- ResolveJavascriptCallback(base::Value(callback_id), 3500- ResolveJavascriptCallback(base::Value(callback_id),
3399- safe_browsing::GetSafeBrowsingPreferencesList( 3501- safe_browsing::GetSafeBrowsingPreferencesList(
3400- user_prefs::UserPrefs::Get(browser_context_))); 3502- user_prefs::UserPrefs::Get(browser_context_)));
3401+ ResolveJavascriptCallback(base::Value(callback_id), base::ListValue()); 3503+ ResolveJavascriptCallback(base::Value(callback_id), base::ListValue());
3402 } 3504 }
3403 3505
3404 void SafeBrowsingUIHandler::GetPolicies(const base::ListValue* args) { 3506 void SafeBrowsingUIHandler::GetPolicies(const base::Value::List& args) {
3405 AllowJavascript(); 3507 AllowJavascript();
3406 DCHECK(!args->GetList().empty()); 3508 DCHECK(!args.empty());
3407 std::string callback_id = args->GetList()[0].GetString(); 3509 std::string callback_id = args[0].GetString();
3408- ResolveJavascriptCallback(base::Value(callback_id), 3510- ResolveJavascriptCallback(base::Value(callback_id),
3409- safe_browsing::GetSafeBrowsingPoliciesList( 3511- safe_browsing::GetSafeBrowsingPoliciesList(
3410- user_prefs::UserPrefs::Get(browser_context_))); 3512- user_prefs::UserPrefs::Get(browser_context_)));
3411 } 3513 }
3412 3514
3413 void SafeBrowsingUIHandler::GetCookie(const base::ListValue* args) { 3515 void SafeBrowsingUIHandler::GetCookie(const base::Value::List& args) {
3414--- components/safe_browsing/core/browser/db/hit_report.h.orig 3516--- a/components/safe_browsing/core/browser/db/hit_report.h
3415+++ components/safe_browsing/core/browser/db/hit_report.h 3517+++ b/components/safe_browsing/core/browser/db/hit_report.h
3416@@ -8,7 +8,6 @@ 3518@@ -8,7 +8,6 @@
3417 #define COMPONENTS_SAFE_BROWSING_CORE_BROWSER_DB_HIT_REPORT_H_ 3519 #define COMPONENTS_SAFE_BROWSING_CORE_BROWSER_DB_HIT_REPORT_H_
3418 3520
@@ -3429,8 +3531,8 @@
3429 bool is_enhanced_protection = false; 3531 bool is_enhanced_protection = false;
3430 bool is_metrics_reporting_active; 3532 bool is_metrics_reporting_active;
3431 3533
3432--- components/safe_browsing/core/browser/db/util.h.orig 3534--- a/components/safe_browsing/core/browser/db/util.h
3433+++ components/safe_browsing/core/browser/db/util.h 3535+++ b/components/safe_browsing/core/browser/db/util.h
3434@@ -18,7 +18,6 @@ 3536@@ -18,7 +18,6 @@
3435 #include "base/strings/string_piece.h" 3537 #include "base/strings/string_piece.h"
3436 #include "base/trace_event/traced_value.h" 3538 #include "base/trace_event/traced_value.h"
@@ -3439,9 +3541,9 @@
3439 3541
3440 namespace safe_browsing { 3542 namespace safe_browsing {
3441 3543
3442--- components/safe_browsing/core/browser/db/v4_local_database_manager.cc.orig 3544--- a/components/safe_browsing/core/browser/db/v4_local_database_manager.cc
3443+++ components/safe_browsing/core/browser/db/v4_local_database_manager.cc 3545+++ b/components/safe_browsing/core/browser/db/v4_local_database_manager.cc
3444@@ -337,10 +337,9 @@ const V4LocalDatabaseManager* 3546@@ -334,10 +334,9 @@ const V4LocalDatabaseManager*
3445 scoped_refptr<V4LocalDatabaseManager> V4LocalDatabaseManager::Create( 3547 scoped_refptr<V4LocalDatabaseManager> V4LocalDatabaseManager::Create(
3446 const base::FilePath& base_path, 3548 const base::FilePath& base_path,
3447 scoped_refptr<base::SequencedTaskRunner> ui_task_runner, 3549 scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
@@ -3454,7 +3556,7 @@
3454 std::move(io_task_runner), nullptr)); 3556 std::move(io_task_runner), nullptr));
3455 } 3557 }
3456 3558
3457@@ -363,14 +362,12 @@ void V4LocalDatabaseManager::CollectData 3559@@ -360,14 +359,12 @@ void V4LocalDatabaseManager::CollectData
3458 3560
3459 V4LocalDatabaseManager::V4LocalDatabaseManager( 3561 V4LocalDatabaseManager::V4LocalDatabaseManager(
3460 const base::FilePath& base_path, 3562 const base::FilePath& base_path,
@@ -3469,7 +3571,7 @@
3469 list_infos_(GetListInfos()), 3571 list_infos_(GetListInfos()),
3470 task_runner_(task_runner_for_tests 3572 task_runner_(task_runner_for_tests
3471 ? task_runner_for_tests 3573 ? task_runner_for_tests
3472@@ -1137,8 +1134,7 @@ void V4LocalDatabaseManager::SetupUpdate 3574@@ -1123,8 +1120,7 @@ void V4LocalDatabaseManager::SetupUpdate
3473 weak_factory_.GetWeakPtr()); 3575 weak_factory_.GetWeakPtr());
3474 3576
3475 v4_update_protocol_manager_ = V4UpdateProtocolManager::Create( 3577 v4_update_protocol_manager_ = V4UpdateProtocolManager::Create(
@@ -3479,9 +3581,9 @@
3479 } 3581 }
3480 3582
3481 void V4LocalDatabaseManager::UpdateRequestCompleted( 3583 void V4LocalDatabaseManager::UpdateRequestCompleted(
3482--- components/safe_browsing/core/browser/db/v4_local_database_manager.h.orig 3584--- a/components/safe_browsing/core/browser/db/v4_local_database_manager.h
3483+++ components/safe_browsing/core/browser/db/v4_local_database_manager.h 3585+++ b/components/safe_browsing/core/browser/db/v4_local_database_manager.h
3484@@ -37,8 +37,7 @@ class V4LocalDatabaseManager : public Sa 3586@@ -39,8 +39,7 @@ class V4LocalDatabaseManager : public Sa
3485 static scoped_refptr<V4LocalDatabaseManager> Create( 3587 static scoped_refptr<V4LocalDatabaseManager> Create(
3486 const base::FilePath& base_path, 3588 const base::FilePath& base_path,
3487 scoped_refptr<base::SequencedTaskRunner> ui_task_runner, 3589 scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
@@ -3491,7 +3593,7 @@
3491 3593
3492 V4LocalDatabaseManager(const V4LocalDatabaseManager&) = delete; 3594 V4LocalDatabaseManager(const V4LocalDatabaseManager&) = delete;
3493 V4LocalDatabaseManager& operator=(const V4LocalDatabaseManager&) = delete; 3595 V4LocalDatabaseManager& operator=(const V4LocalDatabaseManager&) = delete;
3494@@ -108,7 +107,6 @@ class V4LocalDatabaseManager : public Sa 3596@@ -109,7 +108,6 @@ class V4LocalDatabaseManager : public Sa
3495 // Must be initialized by calling StartOnIOThread() before using. 3597 // Must be initialized by calling StartOnIOThread() before using.
3496 V4LocalDatabaseManager( 3598 V4LocalDatabaseManager(
3497 const base::FilePath& base_path, 3599 const base::FilePath& base_path,
@@ -3499,7 +3601,7 @@
3499 scoped_refptr<base::SequencedTaskRunner> ui_task_runner, 3601 scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
3500 scoped_refptr<base::SequencedTaskRunner> io_task_runner, 3602 scoped_refptr<base::SequencedTaskRunner> io_task_runner,
3501 scoped_refptr<base::SequencedTaskRunner> task_runner_for_tests); 3603 scoped_refptr<base::SequencedTaskRunner> task_runner_for_tests);
3502@@ -367,10 +365,6 @@ class V4LocalDatabaseManager : public Sa 3604@@ -369,10 +367,6 @@ class V4LocalDatabaseManager : public Sa
3503 // ready to process next update. 3605 // ready to process next update.
3504 DatabaseUpdatedCallback db_updated_callback_; 3606 DatabaseUpdatedCallback db_updated_callback_;
3505 3607
@@ -3510,9 +3612,9 @@
3510 // The client_state of each list currently being synced. This is updated each 3612 // The client_state of each list currently being synced. This is updated each
3511 // time a database update completes, and used to send list client_state 3613 // time a database update completes, and used to send list client_state
3512 // information in the full hash request. 3614 // information in the full hash request.
3513--- components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig 3615--- a/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
3514+++ components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc 3616+++ b/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
3515@@ -88,7 +88,6 @@ void SetSbV4UrlPrefixForTesting(const ch 3617@@ -89,7 +89,6 @@ void SetSbV4UrlPrefixForTesting(const ch
3516 3618
3517 std::string GetReportUrl(const V4ProtocolConfig& config, 3619 std::string GetReportUrl(const V4ProtocolConfig& config,
3518 const std::string& method, 3620 const std::string& method,
@@ -3520,7 +3622,7 @@
3520 const bool is_enhanced_protection) { 3622 const bool is_enhanced_protection) {
3521 std::string url = base::StringPrintf( 3623 std::string url = base::StringPrintf(
3522 "%s/%s?client=%s&appver=%s&pver=4.0", kSbReportsURLPrefix, method.c_str(), 3624 "%s/%s?client=%s&appver=%s&pver=4.0", kSbReportsURLPrefix, method.c_str(),
3523@@ -98,8 +97,6 @@ std::string GetReportUrl(const V4Protoco 3625@@ -99,8 +98,6 @@ std::string GetReportUrl(const V4Protoco
3524 base::StringAppendF(&url, "&key=%s", 3626 base::StringAppendF(&url, "&key=%s",
3525 net::EscapeQueryParamValue(api_key, true).c_str()); 3627 net::EscapeQueryParamValue(api_key, true).c_str());
3526 } 3628 }
@@ -3529,8 +3631,8 @@
3529 if (is_enhanced_protection) 3631 if (is_enhanced_protection)
3530 url.append(base::StringPrintf("&enh=%d", is_enhanced_protection)); 3632 url.append(base::StringPrintf("&enh=%d", is_enhanced_protection));
3531 return url; 3633 return url;
3532--- components/safe_browsing/core/browser/db/v4_protocol_manager_util.h.orig 3634--- a/components/safe_browsing/core/browser/db/v4_protocol_manager_util.h
3533+++ components/safe_browsing/core/browser/db/v4_protocol_manager_util.h 3635+++ b/components/safe_browsing/core/browser/db/v4_protocol_manager_util.h
3534@@ -18,10 +18,11 @@ 3636@@ -18,10 +18,11 @@
3535 #include <vector> 3637 #include <vector>
3536 3638
@@ -3552,8 +3654,8 @@
3552 const bool is_enhanced_protection = false); 3654 const bool is_enhanced_protection = false);
3553 3655
3554 // Different types of threats that SafeBrowsing protects against. This is the 3656 // Different types of threats that SafeBrowsing protects against. This is the
3555--- components/safe_browsing/core/browser/db/v4_update_protocol_manager.cc.orig 3657--- a/components/safe_browsing/core/browser/db/v4_update_protocol_manager.cc
3556+++ components/safe_browsing/core/browser/db/v4_update_protocol_manager.cc 3658+++ b/components/safe_browsing/core/browser/db/v4_update_protocol_manager.cc
3557@@ -78,19 +78,8 @@ static const int kV4TimerStartIntervalSe 3659@@ -78,19 +78,8 @@ static const int kV4TimerStartIntervalSe
3558 // Maximum time, in seconds, to wait for a response to an update request. 3660 // Maximum time, in seconds, to wait for a response to an update request.
3559 static const int kV4TimerUpdateWaitSecMax = 15 * 60; // 15 minutes 3661 static const int kV4TimerUpdateWaitSecMax = 15 * 60; // 15 minutes
@@ -3640,9 +3742,9 @@
3640 V4ProtocolManagerUtil::SetClientInfoFromConfig(request.mutable_client(), 3742 V4ProtocolManagerUtil::SetClientInfoFromConfig(request.mutable_client(),
3641 config_); 3743 config_);
3642 3744
3643--- components/safe_browsing/core/browser/db/v4_update_protocol_manager.h.orig 3745--- a/components/safe_browsing/core/browser/db/v4_update_protocol_manager.h
3644+++ components/safe_browsing/core/browser/db/v4_update_protocol_manager.h 3746+++ b/components/safe_browsing/core/browser/db/v4_update_protocol_manager.h
3645@@ -24,7 +24,6 @@ 3747@@ -23,7 +23,6 @@
3646 #include "components/safe_browsing/core/browser/db/util.h" 3748 #include "components/safe_browsing/core/browser/db/util.h"
3647 #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" 3749 #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
3648 #include "components/safe_browsing/core/common/proto/webui.pb.h" 3750 #include "components/safe_browsing/core/common/proto/webui.pb.h"
@@ -3650,7 +3752,7 @@
3650 #include "third_party/abseil-cpp/absl/types/optional.h" 3752 #include "third_party/abseil-cpp/absl/types/optional.h"
3651 3753
3652 class GURL; 3754 class GURL;
3653@@ -45,9 +44,6 @@ class V4UpdateProtocolManagerFactory; 3755@@ -44,9 +43,6 @@ class V4UpdateProtocolManagerFactory;
3654 using V4UpdateCallback = 3756 using V4UpdateCallback =
3655 base::RepeatingCallback<void(std::unique_ptr<ParsedServerResponse>)>; 3757 base::RepeatingCallback<void(std::unique_ptr<ParsedServerResponse>)>;
3656 3758
@@ -3660,7 +3762,7 @@
3660 class V4UpdateProtocolManager { 3762 class V4UpdateProtocolManager {
3661 public: 3763 public:
3662 V4UpdateProtocolManager(const V4UpdateProtocolManager&) = delete; 3764 V4UpdateProtocolManager(const V4UpdateProtocolManager&) = delete;
3663@@ -65,8 +61,7 @@ class V4UpdateProtocolManager { 3765@@ -64,8 +60,7 @@ class V4UpdateProtocolManager {
3664 static std::unique_ptr<V4UpdateProtocolManager> Create( 3766 static std::unique_ptr<V4UpdateProtocolManager> Create(
3665 scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory, 3767 scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
3666 const V4ProtocolConfig& config, 3768 const V4ProtocolConfig& config,
@@ -3670,7 +3772,7 @@
3670 3772
3671 void OnURLLoaderComplete(std::unique_ptr<std::string> response_body); 3773 void OnURLLoaderComplete(std::unique_ptr<std::string> response_body);
3672 3774
3673@@ -88,8 +83,7 @@ class V4UpdateProtocolManager { 3775@@ -87,8 +82,7 @@ class V4UpdateProtocolManager {
3674 V4UpdateProtocolManager( 3776 V4UpdateProtocolManager(
3675 scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory, 3777 scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
3676 const V4ProtocolConfig& config, 3778 const V4ProtocolConfig& config,
@@ -3680,7 +3782,7 @@
3680 3782
3681 private: 3783 private:
3682 FRIEND_TEST_ALL_PREFIXES(V4UpdateProtocolManagerTest, 3784 FRIEND_TEST_ALL_PREFIXES(V4UpdateProtocolManagerTest,
3683@@ -207,8 +201,6 @@ class V4UpdateProtocolManager { 3785@@ -206,8 +200,6 @@ class V4UpdateProtocolManager {
3684 // complete. 3786 // complete.
3685 base::OneShotTimer timeout_timer_; 3787 base::OneShotTimer timeout_timer_;
3686 3788
@@ -3689,7 +3791,7 @@
3689 SEQUENCE_CHECKER(sequence_checker_); 3791 SEQUENCE_CHECKER(sequence_checker_);
3690 }; 3792 };
3691 3793
3692@@ -226,8 +218,7 @@ class V4UpdateProtocolManagerFactory { 3794@@ -225,8 +217,7 @@ class V4UpdateProtocolManagerFactory {
3693 virtual std::unique_ptr<V4UpdateProtocolManager> CreateProtocolManager( 3795 virtual std::unique_ptr<V4UpdateProtocolManager> CreateProtocolManager(
3694 scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory, 3796 scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
3695 const V4ProtocolConfig& config, 3797 const V4ProtocolConfig& config,
@@ -3699,8 +3801,8 @@
3699 }; 3801 };
3700 3802
3701 } // namespace safe_browsing 3803 } // namespace safe_browsing
3702--- components/safe_browsing/core/browser/password_protection/password_protection_service_base.h.orig 3804--- a/components/safe_browsing/core/browser/password_protection/password_protection_service_base.h
3703+++ components/safe_browsing/core/browser/password_protection/password_protection_service_base.h 3805+++ b/components/safe_browsing/core/browser/password_protection/password_protection_service_base.h
3704@@ -28,7 +28,6 @@ 3806@@ -28,7 +28,6 @@
3705 #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h" 3807 #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h"
3706 #include "components/safe_browsing/core/browser/safe_browsing_token_fetcher.h" 3808 #include "components/safe_browsing/core/browser/safe_browsing_token_fetcher.h"
@@ -3709,7 +3811,7 @@
3709 #include "components/sessions/core/session_id.h" 3811 #include "components/sessions/core/session_id.h"
3710 #include "components/signin/public/identity_manager/account_info.h" 3812 #include "components/signin/public/identity_manager/account_info.h"
3711 #include "components/signin/public/identity_manager/identity_manager.h" 3813 #include "components/signin/public/identity_manager/identity_manager.h"
3712@@ -149,10 +148,6 @@ class PasswordProtectionServiceBase : pu 3814@@ -150,10 +149,6 @@ class PasswordProtectionServiceBase : pu
3713 // Returns if the warning UI is enabled. 3815 // Returns if the warning UI is enabled.
3714 bool IsWarningEnabled(ReusedPasswordAccountType password_type); 3816 bool IsWarningEnabled(ReusedPasswordAccountType password_type);
3715 3817
@@ -3720,9 +3822,9 @@
3720 // If |url| matches Safe Browsing allowlist domains, password protection 3822 // If |url| matches Safe Browsing allowlist domains, password protection
3721 // change password URL, or password protection login URLs in the enterprise 3823 // change password URL, or password protection login URLs in the enterprise
3722 // policy. 3824 // policy.
3723--- components/safe_browsing/core/browser/ping_manager.cc.orig 3825--- a/components/safe_browsing/core/browser/ping_manager.cc
3724+++ components/safe_browsing/core/browser/ping_manager.cc 3826+++ b/components/safe_browsing/core/browser/ping_manager.cc
3725@@ -141,7 +141,7 @@ GURL PingManager::SafeBrowsingHitUrl( 3827@@ -190,7 +190,7 @@ GURL PingManager::SafeBrowsingHitUrl(
3726 hit_report.threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING || 3828 hit_report.threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING ||
3727 hit_report.threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE); 3829 hit_report.threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE);
3728 std::string url = 3830 std::string url =
@@ -3731,8 +3833,8 @@
3731 hit_report.is_enhanced_protection); 3833 hit_report.is_enhanced_protection);
3732 std::string threat_list = "none"; 3834 std::string threat_list = "none";
3733 switch (hit_report.threat_type) { 3835 switch (hit_report.threat_type) {
3734--- components/safe_browsing/core/browser/realtime/policy_engine.cc.orig 3836--- a/components/safe_browsing/core/browser/realtime/policy_engine.cc
3735+++ components/safe_browsing/core/browser/realtime/policy_engine.cc 3837+++ b/components/safe_browsing/core/browser/realtime/policy_engine.cc
3736@@ -8,7 +8,6 @@ 3838@@ -8,7 +8,6 @@
3737 #include "base/metrics/histogram_macros.h" 3839 #include "base/metrics/histogram_macros.h"
3738 #include "build/build_config.h" 3840 #include "build/build_config.h"
@@ -3741,7 +3843,7 @@
3741 #include "components/safe_browsing/core/common/utils.h" 3843 #include "components/safe_browsing/core/common/utils.h"
3742 #include "components/unified_consent/pref_names.h" 3844 #include "components/unified_consent/pref_names.h"
3743 #include "components/user_prefs/user_prefs.h" 3845 #include "components/user_prefs/user_prefs.h"
3744@@ -35,7 +34,7 @@ bool RealTimePolicyEngine::IsUserMbbOpte 3846@@ -36,7 +35,7 @@ bool RealTimePolicyEngine::IsUserMbbOpte
3745 3847
3746 // static 3848 // static
3747 bool RealTimePolicyEngine::IsUserEpOptedIn(PrefService* pref_service) { 3849 bool RealTimePolicyEngine::IsUserEpOptedIn(PrefService* pref_service) {
@@ -3750,7 +3852,7 @@
3750 } 3852 }
3751 3853
3752 // static 3854 // static
3753@@ -81,9 +80,7 @@ bool RealTimePolicyEngine::CanPerformEnt 3855@@ -82,9 +81,7 @@ bool RealTimePolicyEngine::CanPerformEnt
3754 return false; 3856 return false;
3755 } 3857 }
3756 3858
@@ -3761,8 +3863,8 @@
3761 } 3863 }
3762 3864
3763 // static 3865 // static
3764--- components/safe_browsing/core/browser/realtime/url_lookup_service.cc.orig 3866--- a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc
3765+++ components/safe_browsing/core/browser/realtime/url_lookup_service.cc 3867+++ b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc
3766@@ -19,7 +19,6 @@ 3868@@ -19,7 +19,6 @@
3767 #include "components/safe_browsing/core/browser/referrer_chain_provider.h" 3869 #include "components/safe_browsing/core/browser/referrer_chain_provider.h"
3768 #include "components/safe_browsing/core/browser/safe_browsing_token_fetcher.h" 3870 #include "components/safe_browsing/core/browser/safe_browsing_token_fetcher.h"
@@ -3771,7 +3873,7 @@
3771 #include "components/unified_consent/pref_names.h" 3873 #include "components/unified_consent/pref_names.h"
3772 #include "net/base/ip_address.h" 3874 #include "net/base/ip_address.h"
3773 #include "net/base/load_flags.h" 3875 #include "net/base/load_flags.h"
3774@@ -61,10 +60,6 @@ RealTimeUrlLookupService::RealTimeUrlLoo 3876@@ -62,10 +61,6 @@ RealTimeUrlLookupService::RealTimeUrlLoo
3775 variations_(variations_service) { 3877 variations_(variations_service) {
3776 pref_change_registrar_.Init(pref_service_); 3878 pref_change_registrar_.Init(pref_service_);
3777 pref_change_registrar_.Add( 3879 pref_change_registrar_.Add(
@@ -3782,7 +3884,7 @@
3782 unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled, 3884 unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled,
3783 base::BindRepeating(&RealTimeUrlLookupService::OnPrefChanged, 3885 base::BindRepeating(&RealTimeUrlLookupService::OnPrefChanged,
3784 base::Unretained(this))); 3886 base::Unretained(this)));
3785@@ -144,7 +139,7 @@ bool RealTimeUrlLookupService::CanSendPa 3887@@ -139,7 +134,7 @@ bool RealTimeUrlLookupService::CanSendPa
3786 } 3888 }
3787 3889
3788 bool RealTimeUrlLookupService::CanCheckSubresourceURL() const { 3890 bool RealTimeUrlLookupService::CanCheckSubresourceURL() const {
@@ -3791,22 +3893,35 @@
3791 } 3893 }
3792 3894
3793 bool RealTimeUrlLookupService::CanCheckSafeBrowsingDb() const { 3895 bool RealTimeUrlLookupService::CanCheckSafeBrowsingDb() const {
3794--- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig 3896@@ -149,11 +144,7 @@ bool RealTimeUrlLookupService::CanCheckS
3795+++ components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc 3897 }
3796@@ -16,7 +16,6 @@ 3898
3797 #include "components/prefs/pref_service.h" 3899 bool RealTimeUrlLookupService::CanSendRTSampleRequest() const {
3900- return IsExtendedReportingEnabled(*pref_service_) &&
3901- base::FeatureList::IsEnabled(
3902- safe_browsing::kSendSampledPingsForProtegoAllowlistDomains) &&
3903- (bypass_protego_probability_for_tests_ ||
3904- base::RandDouble() <= kProbabilityForSendingSampledRequests);
3905+ return false;
3906 }
3907
3908 void RealTimeUrlLookupService::Shutdown() {
3909--- a/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
3910+++ b/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
3911@@ -17,7 +17,6 @@
3798 #include "components/safe_browsing/core/browser/referrer_chain_provider.h" 3912 #include "components/safe_browsing/core/browser/referrer_chain_provider.h"
3799 #include "components/safe_browsing/core/browser/verdict_cache_manager.h" 3913 #include "components/safe_browsing/core/browser/verdict_cache_manager.h"
3914 #include "components/safe_browsing/core/common/features.h"
3800-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 3915-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
3801 #include "components/safe_browsing/core/common/safebrowsing_constants.h" 3916 #include "components/safe_browsing/core/common/safebrowsing_constants.h"
3802 #include "components/safe_browsing/core/common/utils.h" 3917 #include "components/safe_browsing/core/common/utils.h"
3803 #include "net/base/ip_address.h" 3918 #include "net/base/ip_address.h"
3804--- components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc.orig 3919--- a/components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc
3805+++ components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc 3920+++ b/components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc
3806@@ -11,13 +11,11 @@ 3921@@ -12,13 +12,11 @@
3807 #include "base/time/time.h"
3808 #include "components/prefs/pref_service.h" 3922 #include "components/prefs/pref_service.h"
3809 #include "components/prefs/scoped_user_pref_update.h" 3923 #include "components/prefs/scoped_user_pref_update.h"
3924 #include "components/safe_browsing/core/browser/db/hit_report.h"
3810-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 3925-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
3811 3926
3812 namespace { 3927 namespace {
@@ -3817,7 +3932,7 @@
3817 3932
3818 const int kMetricsLoggingIntervalDay = 1; 3933 const int kMetricsLoggingIntervalDay = 1;
3819 3934
3820@@ -54,11 +52,6 @@ SafeBrowsingMetricsCollector::SafeBrowsi 3935@@ -59,11 +57,6 @@ SafeBrowsingMetricsCollector::SafeBrowsi
3821 PrefService* pref_service) 3936 PrefService* pref_service)
3822 : pref_service_(pref_service) { 3937 : pref_service_(pref_service) {
3823 pref_change_registrar_.Init(pref_service_); 3938 pref_change_registrar_.Init(pref_service_);
@@ -3829,7 +3944,7 @@
3829 } 3944 }
3830 3945
3831 void SafeBrowsingMetricsCollector::Shutdown() { 3946 void SafeBrowsingMetricsCollector::Shutdown() {
3832@@ -66,16 +59,6 @@ void SafeBrowsingMetricsCollector::Shutd 3947@@ -71,16 +64,6 @@ void SafeBrowsingMetricsCollector::Shutd
3833 } 3948 }
3834 3949
3835 void SafeBrowsingMetricsCollector::StartLogging() { 3950 void SafeBrowsingMetricsCollector::StartLogging() {
@@ -3846,7 +3961,7 @@
3846 } 3961 }
3847 3962
3848 void SafeBrowsingMetricsCollector::LogMetricsAndScheduleNextLogging() { 3963 void SafeBrowsingMetricsCollector::LogMetricsAndScheduleNextLogging() {
3849@@ -83,9 +66,6 @@ void SafeBrowsingMetricsCollector::LogMe 3964@@ -88,9 +71,6 @@ void SafeBrowsingMetricsCollector::LogMe
3850 LogDailyEventMetrics(); 3965 LogDailyEventMetrics();
3851 RemoveOldEventsFromPref(); 3966 RemoveOldEventsFromPref();
3852 3967
@@ -3856,7 +3971,7 @@
3856 ScheduleNextLoggingAfterInterval(base::Days(kMetricsLoggingIntervalDay)); 3971 ScheduleNextLoggingAfterInterval(base::Days(kMetricsLoggingIntervalDay));
3857 } 3972 }
3858 3973
3859@@ -98,181 +78,40 @@ void SafeBrowsingMetricsCollector::Sched 3974@@ -103,87 +83,16 @@ void SafeBrowsingMetricsCollector::Sched
3860 } 3975 }
3861 3976
3862 void SafeBrowsingMetricsCollector::LogDailyOptInMetrics() { 3977 void SafeBrowsingMetricsCollector::LogDailyOptInMetrics() {
@@ -3914,7 +4029,7 @@
3914 void SafeBrowsingMetricsCollector::RemoveOldEventsFromPref() { 4029 void SafeBrowsingMetricsCollector::RemoveOldEventsFromPref() {
3915- DictionaryPrefUpdate update(pref_service_, 4030- DictionaryPrefUpdate update(pref_service_,
3916- prefs::kSafeBrowsingEventTimestamps); 4031- prefs::kSafeBrowsingEventTimestamps);
3917- base::DictionaryValue* mutable_state_dict = update.Get(); 4032- base::Value* mutable_state_dict = update.Get();
3918- bool is_pref_valid = mutable_state_dict->is_dict(); 4033- bool is_pref_valid = mutable_state_dict->is_dict();
3919- base::UmaHistogramBoolean("SafeBrowsing.MetricsCollector.IsPrefValid", 4034- base::UmaHistogramBoolean("SafeBrowsing.MetricsCollector.IsPrefValid",
3920- is_pref_valid); 4035- is_pref_valid);
@@ -3943,47 +4058,30 @@
3943- AddSafeBrowsingEventAndUserStateToPref(GetUserState(), event_type); 4058- AddSafeBrowsingEventAndUserStateToPref(GetUserState(), event_type);
3944 } 4059 }
3945 4060
3946 absl::optional<base::Time> 4061 void SafeBrowsingMetricsCollector::AddBypassEventToPref(
3947 SafeBrowsingMetricsCollector::GetLatestEventTimestamp(EventType event_type) { 4062@@ -220,15 +129,7 @@ absl::optional<base::Time>
3948- // Events are not logged when Safe Browsing is disabled. 4063 SafeBrowsingMetricsCollector::GetLatestEventTimestamp(
4064 EventTypeFilter event_type_filter) {
4065 // Events are not logged when Safe Browsing is disabled.
3949- SafeBrowsingState sb_state = GetSafeBrowsingState(*pref_service_); 4066- SafeBrowsingState sb_state = GetSafeBrowsingState(*pref_service_);
3950- if (sb_state == SafeBrowsingState::NO_SAFE_BROWSING) { 4067- if (sb_state == SafeBrowsingState::NO_SAFE_BROWSING) {
3951 return absl::nullopt; 4068 return absl::nullopt;
3952- } 4069- }
3953- 4070-
3954- const absl::optional<Event> event = 4071- const absl::optional<Event> event =
3955- GetLatestEventFromEventType(GetUserState(), event_type); 4072- GetLatestEventFromEventTypeFilter(GetUserState(), event_type_filter);
3956- return event ? absl::optional<base::Time>(event.value().timestamp) 4073- return event ? absl::optional<base::Time>(event.value().timestamp)
3957- : absl::nullopt; 4074- : absl::nullopt;
3958 } 4075 }
3959 4076
3960 absl::optional<base::Time> 4077 absl::optional<base::Time>
3961 SafeBrowsingMetricsCollector::GetLatestSecuritySensitiveEventTimestamp() { 4078@@ -240,55 +141,14 @@ SafeBrowsingMetricsCollector::GetLatestS
3962- std::vector<absl::optional<base::Time>> security_sensitive_event_times{
3963- GetLatestEventTimestamp(SECURITY_SENSITIVE_SAFE_BROWSING_INTERSTITIAL),
3964- GetLatestEventTimestamp(SECURITY_SENSITIVE_SSL_INTERSTITIAL),
3965- GetLatestEventTimestamp(SECURITY_SENSITIVE_PASSWORD_PROTECTION),
3966- GetLatestEventTimestamp(SECURITY_SENSITIVE_DOWNLOAD)};
3967 absl::optional<base::Time> latest_event_time = absl::nullopt;
3968- for (absl::optional<base::Time> security_sensitive_event_time :
3969- security_sensitive_event_times) {
3970- if (!security_sensitive_event_time) {
3971- continue;
3972- }
3973- if (!latest_event_time ||
3974- (latest_event_time.value() < security_sensitive_event_time.value())) {
3975- latest_event_time = security_sensitive_event_time;
3976- }
3977- }
3978 return latest_event_time;
3979 }
3980
3981 void SafeBrowsingMetricsCollector::AddSafeBrowsingEventAndUserStateToPref( 4079 void SafeBrowsingMetricsCollector::AddSafeBrowsingEventAndUserStateToPref(
3982 UserState user_state, 4080 UserState user_state,
3983 EventType event_type) { 4081 EventType event_type) {
3984- DictionaryPrefUpdate update(pref_service_, 4082- DictionaryPrefUpdate update(pref_service_,
3985- prefs::kSafeBrowsingEventTimestamps); 4083- prefs::kSafeBrowsingEventTimestamps);
3986- base::DictionaryValue* mutable_state_dict = update.Get(); 4084- base::Value* mutable_state_dict = update.Get();
3987- 4085-
3988- base::Value* event_dict = 4086- base::Value* event_dict =
3989- mutable_state_dict->FindDictKey(UserStateToPrefKey(user_state)); 4087- mutable_state_dict->FindDictKey(UserStateToPrefKey(user_state));
@@ -4001,8 +4099,8 @@
4001- } 4099- }
4002- 4100-
4003- // Remove the oldest timestamp if the length of the timestamps hits the limit. 4101- // Remove the oldest timestamp if the length of the timestamps hits the limit.
4004- while (timestamps->GetList().size() >= kTimestampsMaxLength) { 4102- while (timestamps->GetListDeprecated().size() >= kTimestampsMaxLength) {
4005- timestamps->EraseListIter(timestamps->GetList().begin()); 4103- timestamps->EraseListIter(timestamps->GetListDeprecated().begin());
4006- } 4104- }
4007- 4105-
4008- timestamps->Append(TimeToPrefValue(base::Time::Now())); 4106- timestamps->Append(TimeToPrefValue(base::Time::Now()));
@@ -4017,12 +4115,7 @@
4017- if (!pref_service_->GetBoolean(prefs::kSafeBrowsingEnhanced)) { 4115- if (!pref_service_->GetBoolean(prefs::kSafeBrowsingEnhanced)) {
4018- AddSafeBrowsingEventAndUserStateToPref(UserState::kEnhancedProtection, 4116- AddSafeBrowsingEventAndUserStateToPref(UserState::kEnhancedProtection,
4019- EventType::USER_STATE_DISABLED); 4117- EventType::USER_STATE_DISABLED);
4020- int disabled_times_last_week = GetEventCountSince( 4118- LogEnhancedProtectionDisabledMetrics();
4021- UserState::kEnhancedProtection, EventType::USER_STATE_DISABLED,
4022- base::Time::Now() - base::Days(7));
4023- if (disabled_times_last_week <= kEsbDisabledMetricsQuota) {
4024- LogEnhancedProtectionDisabledMetrics();
4025- }
4026- } else { 4119- } else {
4027- AddSafeBrowsingEventAndUserStateToPref(UserState::kEnhancedProtection, 4120- AddSafeBrowsingEventAndUserStateToPref(UserState::kEnhancedProtection,
4028- EventType::USER_STATE_ENABLED); 4121- EventType::USER_STATE_ENABLED);
@@ -4031,7 +4124,7 @@
4031 4124
4032 const base::Value* SafeBrowsingMetricsCollector::GetSafeBrowsingEventDictionary( 4125 const base::Value* SafeBrowsingMetricsCollector::GetSafeBrowsingEventDictionary(
4033 UserState user_state) { 4126 UserState user_state) {
4034- const base::DictionaryValue* state_dict = 4127- const base::Value* state_dict =
4035- pref_service_->GetDictionary(prefs::kSafeBrowsingEventTimestamps); 4128- pref_service_->GetDictionary(prefs::kSafeBrowsingEventTimestamps);
4036- 4129-
4037- return state_dict->FindDictKey(UserStateToPrefKey(user_state)); 4130- return state_dict->FindDictKey(UserStateToPrefKey(user_state));
@@ -4039,7 +4132,7 @@
4039 } 4132 }
4040 4133
4041 absl::optional<SafeBrowsingMetricsCollector::Event> 4134 absl::optional<SafeBrowsingMetricsCollector::Event>
4042@@ -370,20 +209,7 @@ int SafeBrowsingMetricsCollector::GetEve 4135@@ -449,20 +309,7 @@ int SafeBrowsingMetricsCollector::GetEve
4043 } 4136 }
4044 4137
4045 UserState SafeBrowsingMetricsCollector::GetUserState() { 4138 UserState SafeBrowsingMetricsCollector::GetUserState() {
@@ -4061,8 +4154,8 @@
4061 } 4154 }
4062 4155
4063 bool SafeBrowsingMetricsCollector::IsBypassEventType(const EventType& type) { 4156 bool SafeBrowsingMetricsCollector::IsBypassEventType(const EventType& type) {
4064--- components/safe_browsing/core/common/BUILD.gn.orig 4157--- a/components/safe_browsing/core/common/BUILD.gn
4065+++ components/safe_browsing/core/common/BUILD.gn 4158+++ b/components/safe_browsing/core/common/BUILD.gn
4066@@ -6,20 +6,8 @@ import("//build/config/features.gni") 4159@@ -6,20 +6,8 @@ import("//build/config/features.gni")
4067 import("//components/safe_browsing/buildflags.gni") 4160 import("//components/safe_browsing/buildflags.gni")
4068 import("//mojo/public/tools/bindings/mojom.gni") 4161 import("//mojo/public/tools/bindings/mojom.gni")
@@ -4086,8 +4179,8 @@
4086 } 4179 }
4087 4180
4088 source_set("safe_browsing_policy_handler") { 4181 source_set("safe_browsing_policy_handler") {
4089--- components/safe_browsing/core/common/safe_browsing_policy_handler.cc.orig 4182--- a/components/safe_browsing/core/common/safe_browsing_policy_handler.cc
4090+++ components/safe_browsing/core/common/safe_browsing_policy_handler.cc 4183+++ b/components/safe_browsing/core/common/safe_browsing_policy_handler.cc
4091@@ -11,7 +11,6 @@ 4184@@ -11,7 +11,6 @@
4092 #include "components/policy/policy_constants.h" 4185 #include "components/policy/policy_constants.h"
4093 #include "components/prefs/pref_service.h" 4186 #include "components/prefs/pref_service.h"
@@ -4096,7 +4189,7 @@
4096 #include "components/strings/grit/components_strings.h" 4189 #include "components/strings/grit/components_strings.h"
4097 #include "third_party/abseil-cpp/absl/types/optional.h" 4190 #include "third_party/abseil-cpp/absl/types/optional.h"
4098 4191
4099@@ -172,34 +171,14 @@ void SafeBrowsingPolicyHandler::ApplyPol 4192@@ -180,34 +179,14 @@ void SafeBrowsingPolicyHandler::ApplyPol
4100 4193
4101 if (!value.has_value()) 4194 if (!value.has_value())
4102 return; 4195 return;
@@ -4133,7 +4226,7 @@
4133 4226
4134 if (safe_browsing_enhanced) 4227 if (safe_browsing_enhanced)
4135 return ProtectionLevel::kEnhancedProtection; 4228 return ProtectionLevel::kEnhancedProtection;
4136@@ -213,10 +192,8 @@ SafeBrowsingPolicyHandler::GetSafeBrowsi 4229@@ -221,10 +200,8 @@ SafeBrowsingPolicyHandler::GetSafeBrowsi
4137 // static 4230 // static
4138 bool SafeBrowsingPolicyHandler::IsSafeBrowsingProtectionLevelSetByPolicy( 4231 bool SafeBrowsingPolicyHandler::IsSafeBrowsingProtectionLevelSetByPolicy(
4139 const PrefService* pref_service) { 4232 const PrefService* pref_service) {
@@ -4146,8 +4239,8 @@
4146 DCHECK_EQ(is_safe_browsing_enabled_managed, 4239 DCHECK_EQ(is_safe_browsing_enabled_managed,
4147 is_safe_browsing_enhanced_managed); 4240 is_safe_browsing_enhanced_managed);
4148 return is_safe_browsing_enabled_managed && is_safe_browsing_enhanced_managed; 4241 return is_safe_browsing_enabled_managed && is_safe_browsing_enhanced_managed;
4149--- components/safe_browsing/core/common/safe_browsing_prefs_unittest.cc.orig 4242--- a/components/safe_browsing/core/common/safe_browsing_prefs_unittest.cc
4150+++ components/safe_browsing/core/common/safe_browsing_prefs_unittest.cc 4243+++ b/components/safe_browsing/core/common/safe_browsing_prefs_unittest.cc
4151@@ -12,7 +12,6 @@ 4244@@ -12,7 +12,6 @@
4152 #include "components/prefs/pref_registry_simple.h" 4245 #include "components/prefs/pref_registry_simple.h"
4153 #include "components/prefs/testing_pref_service.h" 4246 #include "components/prefs/testing_pref_service.h"
@@ -4156,8 +4249,8 @@
4156 #include "testing/gtest/include/gtest/gtest.h" 4249 #include "testing/gtest/include/gtest/gtest.h"
4157 #include "url/gurl.h" 4250 #include "url/gurl.h"
4158 4251
4159--- components/safety_check/safety_check.cc.orig 4252--- a/components/safety_check/safety_check.cc
4160+++ components/safety_check/safety_check.cc 4253+++ b/components/safety_check/safety_check.cc
4161@@ -4,26 +4,9 @@ 4254@@ -4,26 +4,9 @@
4162 4255
4163 #include "components/safety_check/safety_check.h" 4256 #include "components/safety_check/safety_check.h"
@@ -4185,8 +4278,8 @@
4185 return SafeBrowsingStatus::kDisabled; 4278 return SafeBrowsingStatus::kDisabled;
4186 } 4279 }
4187 4280
4188--- components/security_interstitials/content/bad_clock_blocking_page.cc.orig 4281--- a/components/security_interstitials/content/bad_clock_blocking_page.cc
4189+++ components/security_interstitials/content/bad_clock_blocking_page.cc 4282+++ b/components/security_interstitials/content/bad_clock_blocking_page.cc
4190@@ -7,7 +7,6 @@ 4283@@ -7,7 +7,6 @@
4191 #include <utility> 4284 #include <utility>
4192 4285
@@ -4195,8 +4288,8 @@
4195 #include "components/security_interstitials/content/cert_report_helper.h" 4288 #include "components/security_interstitials/content/cert_report_helper.h"
4196 #include "components/security_interstitials/content/security_interstitial_controller_client.h" 4289 #include "components/security_interstitials/content/security_interstitial_controller_client.h"
4197 #include "components/security_interstitials/content/security_interstitial_page.h" 4290 #include "components/security_interstitials/content/security_interstitial_page.h"
4198--- components/security_interstitials/content/captive_portal_blocking_page.cc.orig 4291--- a/components/security_interstitials/content/captive_portal_blocking_page.cc
4199+++ components/security_interstitials/content/captive_portal_blocking_page.cc 4292+++ b/components/security_interstitials/content/captive_portal_blocking_page.cc
4200@@ -15,7 +15,6 @@ 4293@@ -15,7 +15,6 @@
4201 #include "build/build_config.h" 4294 #include "build/build_config.h"
4202 #include "components/captive_portal/core/captive_portal_detector.h" 4295 #include "components/captive_portal/core/captive_portal_detector.h"
@@ -4205,8 +4298,8 @@
4205 #include "components/security_interstitials/content/cert_report_helper.h" 4298 #include "components/security_interstitials/content/cert_report_helper.h"
4206 #include "components/security_interstitials/content/security_interstitial_controller_client.h" 4299 #include "components/security_interstitials/content/security_interstitial_controller_client.h"
4207 #include "components/security_interstitials/content/ssl_cert_reporter.h" 4300 #include "components/security_interstitials/content/ssl_cert_reporter.h"
4208--- components/security_interstitials/content/cert_report_helper.cc.orig 4301--- a/components/security_interstitials/content/cert_report_helper.cc
4209+++ components/security_interstitials/content/cert_report_helper.cc 4302+++ b/components/security_interstitials/content/cert_report_helper.cc
4210@@ -14,7 +14,6 @@ 4303@@ -14,7 +14,6 @@
4211 #include "build/branding_buildflags.h" 4304 #include "build/branding_buildflags.h"
4212 #include "build/build_config.h" 4305 #include "build/build_config.h"
@@ -4303,8 +4396,8 @@
4303 } 4396 }
4304 4397
4305 bool CertReportHelper::ShouldReportCertificateError() { 4398 bool CertReportHelper::ShouldReportCertificateError() {
4306--- components/security_interstitials/content/mitm_software_blocking_page.cc.orig 4399--- a/components/security_interstitials/content/mitm_software_blocking_page.cc
4307+++ components/security_interstitials/content/mitm_software_blocking_page.cc 4400+++ b/components/security_interstitials/content/mitm_software_blocking_page.cc
4308@@ -6,7 +6,6 @@ 4401@@ -6,7 +6,6 @@
4309 4402
4310 #include <utility> 4403 #include <utility>
@@ -4313,8 +4406,8 @@
4313 #include "components/security_interstitials/content/cert_report_helper.h" 4406 #include "components/security_interstitials/content/cert_report_helper.h"
4314 #include "components/security_interstitials/content/security_interstitial_controller_client.h" 4407 #include "components/security_interstitials/content/security_interstitial_controller_client.h"
4315 #include "components/security_interstitials/content/security_interstitial_page.h" 4408 #include "components/security_interstitials/content/security_interstitial_page.h"
4316--- components/security_interstitials/content/security_interstitial_controller_client.cc.orig 4409--- a/components/security_interstitials/content/security_interstitial_controller_client.cc
4317+++ components/security_interstitials/content/security_interstitial_controller_client.cc 4410+++ b/components/security_interstitials/content/security_interstitial_controller_client.cc
4318@@ -7,7 +7,6 @@ 4411@@ -7,7 +7,6 @@
4319 #include <utility> 4412 #include <utility>
4320 4413
@@ -4322,8 +4415,8 @@
4322-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 4415-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
4323 #include "components/security_interstitials/content/settings_page_helper.h" 4416 #include "components/security_interstitials/content/settings_page_helper.h"
4324 #include "components/security_interstitials/core/metrics_helper.h" 4417 #include "components/security_interstitials/core/metrics_helper.h"
4325 #include "content/public/browser/web_contents.h" 4418 #include "content/public/browser/navigation_entry.h"
4326@@ -98,11 +97,6 @@ SecurityInterstitialControllerClient::Ge 4419@@ -99,11 +98,6 @@ SecurityInterstitialControllerClient::Ge
4327 return prefs_; 4420 return prefs_;
4328 } 4421 }
4329 4422
@@ -4335,19 +4428,19 @@
4335 bool SecurityInterstitialControllerClient::CanLaunchDateAndTimeSettings() { 4428 bool SecurityInterstitialControllerClient::CanLaunchDateAndTimeSettings() {
4336 NOTREACHED(); 4429 NOTREACHED();
4337 return false; 4430 return false;
4338--- components/security_interstitials/content/security_interstitial_controller_client.h.orig 4431--- a/components/security_interstitials/content/security_interstitial_controller_client.h
4339+++ components/security_interstitials/content/security_interstitial_controller_client.h 4432+++ b/components/security_interstitials/content/security_interstitial_controller_client.h
4340@@ -54,8 +54,6 @@ class SecurityInterstitialControllerClie 4433@@ -54,8 +54,6 @@ class SecurityInterstitialControllerClie
4341 bool CanGoBackBeforeNavigation() override; 4434 bool CanGoBackBeforeNavigation() override;
4342 4435
4343 protected: 4436 protected:
4344- // security_interstitials::ControllerClient overrides. 4437- // security_interstitials::ControllerClient overrides.
4345- const std::string GetExtendedReportingPrefName() const override; 4438- const std::string GetExtendedReportingPrefName() const override;
4346 content::WebContents* web_contents_; 4439 raw_ptr<content::WebContents> web_contents_;
4347 4440
4348 private: 4441 private:
4349--- components/security_interstitials/content/security_interstitial_page.cc.orig 4442--- a/components/security_interstitials/content/security_interstitial_page.cc
4350+++ components/security_interstitials/content/security_interstitial_page.cc 4443+++ b/components/security_interstitials/content/security_interstitial_page.cc
4351@@ -11,7 +11,6 @@ 4444@@ -11,7 +11,6 @@
4352 #include "base/values.h" 4445 #include "base/values.h"
4353 #include "components/grit/components_resources.h" 4446 #include "components/grit/components_resources.h"
@@ -4388,8 +4481,8 @@
4388 } 4481 }
4389 4482
4390 std::u16string SecurityInterstitialPage::GetFormattedHostName() const { 4483 std::u16string SecurityInterstitialPage::GetFormattedHostName() const {
4391--- components/security_interstitials/content/ssl_blocking_page.cc.orig 4484--- a/components/security_interstitials/content/ssl_blocking_page.cc
4392+++ components/security_interstitials/content/ssl_blocking_page.cc 4485+++ b/components/security_interstitials/content/ssl_blocking_page.cc
4393@@ -12,7 +12,6 @@ 4486@@ -12,7 +12,6 @@
4394 #include "base/metrics/histogram_macros.h" 4487 #include "base/metrics/histogram_macros.h"
4395 #include "base/strings/string_number_conversions.h" 4488 #include "base/strings/string_number_conversions.h"
@@ -4398,8 +4491,8 @@
4398 #include "components/security_interstitials/content/cert_report_helper.h" 4491 #include "components/security_interstitials/content/cert_report_helper.h"
4399 #include "components/security_interstitials/content/security_interstitial_controller_client.h" 4492 #include "components/security_interstitials/content/security_interstitial_controller_client.h"
4400 #include "components/security_interstitials/content/security_interstitial_page.h" 4493 #include "components/security_interstitials/content/security_interstitial_page.h"
4401--- components/security_interstitials/core/controller_client.cc.orig 4494--- a/components/security_interstitials/core/controller_client.cc
4402+++ components/security_interstitials/core/controller_client.cc 4495+++ b/components/security_interstitials/core/controller_client.cc
4403@@ -36,7 +36,6 @@ MetricsHelper* ControllerClient::metrics 4496@@ -36,7 +36,6 @@ MetricsHelper* ControllerClient::metrics
4404 4497
4405 void ControllerClient::SetReportingPreference(bool report) { 4498 void ControllerClient::SetReportingPreference(bool report) {
@@ -4408,9 +4501,9 @@
4408 metrics_helper_->RecordUserInteraction( 4501 metrics_helper_->RecordUserInteraction(
4409 report ? MetricsHelper::SET_EXTENDED_REPORTING_ENABLED 4502 report ? MetricsHelper::SET_EXTENDED_REPORTING_ENABLED
4410 : MetricsHelper::SET_EXTENDED_REPORTING_DISABLED); 4503 : MetricsHelper::SET_EXTENDED_REPORTING_DISABLED);
4411--- components/security_interstitials/core/controller_client.h.orig 4504--- a/components/security_interstitials/core/controller_client.h
4412+++ components/security_interstitials/core/controller_client.h 4505+++ b/components/security_interstitials/core/controller_client.h
4413@@ -122,9 +122,6 @@ class ControllerClient { 4506@@ -121,9 +121,6 @@ class ControllerClient {
4414 4507
4415 void SetBaseHelpCenterUrlForTesting(const GURL& test_url); 4508 void SetBaseHelpCenterUrlForTesting(const GURL& test_url);
4416 4509
@@ -4420,8 +4513,8 @@
4420 private: 4513 private:
4421 std::unique_ptr<MetricsHelper> metrics_helper_; 4514 std::unique_ptr<MetricsHelper> metrics_helper_;
4422 // Link to the help center. 4515 // Link to the help center.
4423--- components/signin/core/browser/account_investigator.cc.orig 4516--- a/components/signin/core/browser/account_investigator.cc
4424+++ components/signin/core/browser/account_investigator.cc 4517+++ b/components/signin/core/browser/account_investigator.cc
4425@@ -13,7 +13,6 @@ 4518@@ -13,7 +13,6 @@
4426 #include "components/prefs/pref_registry_simple.h" 4519 #include "components/prefs/pref_registry_simple.h"
4427 #include "components/prefs/pref_service.h" 4520 #include "components/prefs/pref_service.h"
@@ -4496,9 +4589,9 @@
4496 base::TimeDelta stable_age; 4589 base::TimeDelta stable_age;
4497 if (!last_changed.is_null()) 4590 if (!last_changed.is_null())
4498 stable_age = std::max(now - last_changed, base::TimeDelta()); 4591 stable_age = std::max(now - last_changed, base::TimeDelta());
4499--- components/signin/core/browser/account_investigator_unittest.cc.orig 4592--- a/components/signin/core/browser/account_investigator_unittest.cc
4500+++ components/signin/core/browser/account_investigator_unittest.cc 4593+++ b/components/signin/core/browser/account_investigator_unittest.cc
4501@@ -12,7 +12,6 @@ 4594@@ -13,7 +13,6 @@
4502 #include "build/build_config.h" 4595 #include "build/build_config.h"
4503 #include "components/prefs/pref_registry_simple.h" 4596 #include "components/prefs/pref_registry_simple.h"
4504 #include "components/signin/public/base/signin_metrics.h" 4597 #include "components/signin/public/base/signin_metrics.h"
@@ -4506,8 +4599,8 @@
4506 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" 4599 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
4507 #include "components/signin/public/identity_manager/identity_test_environment.h" 4600 #include "components/signin/public/identity_manager/identity_test_environment.h"
4508 #include "components/sync_preferences/testing_pref_service_syncable.h" 4601 #include "components/sync_preferences/testing_pref_service_syncable.h"
4509--- components/signin/core/browser/account_reconcilor_unittest.cc.orig 4602--- a/components/signin/core/browser/account_reconcilor_unittest.cc
4510+++ components/signin/core/browser/account_reconcilor_unittest.cc 4603+++ b/components/signin/core/browser/account_reconcilor_unittest.cc
4511@@ -29,7 +29,6 @@ 4604@@ -29,7 +29,6 @@
4512 #include "components/signin/public/base/list_accounts_test_utils.h" 4605 #include "components/signin/public/base/list_accounts_test_utils.h"
4513 #include "components/signin/public/base/signin_buildflags.h" 4606 #include "components/signin/public/base/signin_buildflags.h"
@@ -4516,8 +4609,8 @@
4516 #include "components/signin/public/base/test_signin_client.h" 4609 #include "components/signin/public/base/test_signin_client.h"
4517 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" 4610 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
4518 #include "components/signin/public/identity_manager/identity_test_environment.h" 4611 #include "components/signin/public/identity_manager/identity_test_environment.h"
4519--- components/signin/core/browser/dice_account_reconcilor_delegate.cc.orig 4612--- a/components/signin/core/browser/dice_account_reconcilor_delegate.cc
4520+++ components/signin/core/browser/dice_account_reconcilor_delegate.cc 4613+++ b/components/signin/core/browser/dice_account_reconcilor_delegate.cc
4521@@ -12,7 +12,6 @@ 4614@@ -12,7 +12,6 @@
4522 #include "base/ranges/algorithm.h" 4615 #include "base/ranges/algorithm.h"
4523 #include "components/prefs/pref_service.h" 4616 #include "components/prefs/pref_service.h"
@@ -4526,8 +4619,8 @@
4526 4619
4527 namespace signin { 4620 namespace signin {
4528 4621
4529--- components/signin/core/browser/dice_account_reconcilor_delegate_unittest.cc.orig 4622--- a/components/signin/core/browser/dice_account_reconcilor_delegate_unittest.cc
4530+++ components/signin/core/browser/dice_account_reconcilor_delegate_unittest.cc 4623+++ b/components/signin/core/browser/dice_account_reconcilor_delegate_unittest.cc
4531@@ -8,7 +8,6 @@ 4624@@ -8,7 +8,6 @@
4532 4625
4533 #include "components/prefs/pref_registry_simple.h" 4626 #include "components/prefs/pref_registry_simple.h"
@@ -4536,8 +4629,8 @@
4536 #include "components/signin/public/base/test_signin_client.h" 4629 #include "components/signin/public/base/test_signin_client.h"
4537 #include "components/sync_preferences/testing_pref_service_syncable.h" 4630 #include "components/sync_preferences/testing_pref_service_syncable.h"
4538 #include "google_apis/gaia/gaia_auth_util.h" 4631 #include "google_apis/gaia/gaia_auth_util.h"
4539--- components/signin/core/browser/signin_investigator.cc.orig 4632--- a/components/signin/core/browser/signin_investigator.cc
4540+++ components/signin/core/browser/signin_investigator.cc 4633+++ b/components/signin/core/browser/signin_investigator.cc
4541@@ -7,7 +7,6 @@ 4634@@ -7,7 +7,6 @@
4542 #include "base/check.h" 4635 #include "base/check.h"
4543 #include "base/metrics/histogram_macros.h" 4636 #include "base/metrics/histogram_macros.h"
@@ -4574,8 +4667,8 @@
4574 scenario = InvestigatedScenario::kFirstSignIn; 4667 scenario = InvestigatedScenario::kFirstSignIn;
4575 } else if (AreAccountsEqualWithFallback()) { 4668 } else if (AreAccountsEqualWithFallback()) {
4576 scenario = InvestigatedScenario::kSameAccount; 4669 scenario = InvestigatedScenario::kSameAccount;
4577--- components/signin/core/browser/signin_investigator_unittest.cc.orig 4670--- a/components/signin/core/browser/signin_investigator_unittest.cc
4578+++ components/signin/core/browser/signin_investigator_unittest.cc 4671+++ b/components/signin/core/browser/signin_investigator_unittest.cc
4579@@ -9,7 +9,6 @@ 4672@@ -9,7 +9,6 @@
4580 #include "components/prefs/pref_registry_simple.h" 4673 #include "components/prefs/pref_registry_simple.h"
4581 #include "components/signin/core/browser/signin_investigator.h" 4674 #include "components/signin/core/browser/signin_investigator.h"
@@ -4584,9 +4677,9 @@
4584 #include "components/signin/public/identity_manager/identity_test_environment.h" 4677 #include "components/signin/public/identity_manager/identity_test_environment.h"
4585 #include "components/sync_preferences/testing_pref_service_syncable.h" 4678 #include "components/sync_preferences/testing_pref_service_syncable.h"
4586 #include "testing/gtest/include/gtest/gtest.h" 4679 #include "testing/gtest/include/gtest/gtest.h"
4587--- components/signin/internal/identity_manager/account_tracker_service.cc.orig 4680--- a/components/signin/internal/identity_manager/account_tracker_service.cc
4588+++ components/signin/internal/identity_manager/account_tracker_service.cc 4681+++ b/components/signin/internal/identity_manager/account_tracker_service.cc
4589@@ -29,7 +29,6 @@ 4682@@ -31,7 +31,6 @@
4590 #include "components/prefs/scoped_user_pref_update.h" 4683 #include "components/prefs/scoped_user_pref_update.h"
4591 #include "components/signin/internal/identity_manager/account_capabilities_constants.h" 4684 #include "components/signin/internal/identity_manager/account_capabilities_constants.h"
4592 #include "components/signin/internal/identity_manager/account_info_util.h" 4685 #include "components/signin/internal/identity_manager/account_info_util.h"
@@ -4594,7 +4687,7 @@
4594 #include "components/signin/public/base/signin_switches.h" 4687 #include "components/signin/public/base/signin_switches.h"
4595 #include "components/signin/public/identity_manager/account_capabilities.h" 4688 #include "components/signin/public/identity_manager/account_capabilities.h"
4596 #include "components/signin/public/identity_manager/tribool.h" 4689 #include "components/signin/public/identity_manager/tribool.h"
4597@@ -152,9 +151,6 @@ AccountTrackerService::~AccountTrackerSe 4690@@ -178,9 +177,6 @@ AccountTrackerService::~AccountTrackerSe
4598 4691
4599 // static 4692 // static
4600 void AccountTrackerService::RegisterPrefs(PrefRegistrySimple* registry) { 4693 void AccountTrackerService::RegisterPrefs(PrefRegistrySimple* registry) {
@@ -4604,7 +4697,7 @@
4604 } 4697 }
4605 4698
4606 void AccountTrackerService::Initialize(PrefService* pref_service, 4699 void AccountTrackerService::Initialize(PrefService* pref_service,
4607@@ -455,14 +451,12 @@ AccountTrackerService::ComputeNewMigrati 4700@@ -481,14 +477,12 @@ AccountTrackerService::ComputeNewMigrati
4608 4701
4609 void AccountTrackerService::SetMigrationState(AccountIdMigrationState state) { 4702 void AccountTrackerService::SetMigrationState(AccountIdMigrationState state) {
4610 DCHECK(state != MIGRATION_DONE || AreAllAccountsMigrated()); 4703 DCHECK(state != MIGRATION_DONE || AreAllAccountsMigrated());
@@ -4620,7 +4713,7 @@
4620 } 4713 }
4621 4714
4622 base::FilePath AccountTrackerService::GetImagePathFor( 4715 base::FilePath AccountTrackerService::GetImagePathFor(
4623@@ -519,24 +513,7 @@ void AccountTrackerService::OnAccountIma 4716@@ -545,27 +539,6 @@ void AccountTrackerService::OnAccountIma
4624 const CoreAccountId& account_id, 4717 const CoreAccountId& account_id,
4625 const std::string& image_url_with_size, 4718 const std::string& image_url_with_size,
4626 bool success) { 4719 bool success) {
@@ -4629,12 +4722,15 @@
4629- 4722-
4630- base::DictionaryValue* dict = nullptr; 4723- base::DictionaryValue* dict = nullptr;
4631- ListPrefUpdate update(pref_service_, prefs::kAccountInfo); 4724- ListPrefUpdate update(pref_service_, prefs::kAccountInfo);
4632- for (size_t i = 0; i < update->GetList().size(); ++i, dict = nullptr) { 4725- for (size_t i = 0; i < update->GetListDeprecated().size();
4633- if (update->GetDictionary(i, &dict)) { 4726- ++i, dict = nullptr) {
4634- std::string value; 4727- base::Value& dict_value = update->GetListDeprecated()[i];
4635- if (dict->GetString(kAccountKeyPath, &value) && 4728- if (dict_value.is_dict()) {
4636- value == account_id.ToString()) 4729- dict = static_cast<base::DictionaryValue*>(&dict_value);
4730- const std::string* account_key = dict->FindStringKey(kAccountKeyPath);
4731- if (account_key && *account_key == account_id.ToString()) {
4637- break; 4732- break;
4733- }
4638- } 4734- }
4639- } 4735- }
4640- 4736-
@@ -4642,67 +4738,177 @@
4642- return; 4738- return;
4643- } 4739- }
4644- dict->SetString(kLastDownloadedImageURLWithSizePath, image_url_with_size); 4740- dict->SetString(kLastDownloadedImageURLWithSizePath, image_url_with_size);
4645+ return;
4646 } 4741 }
4647 4742
4648 void AccountTrackerService::RemoveAccountImageFromDisk( 4743 void AccountTrackerService::RemoveAccountImageFromDisk(
4649@@ -548,11 +525,10 @@ void AccountTrackerService::RemoveAccoun 4744@@ -577,181 +550,16 @@ void AccountTrackerService::RemoveAccoun
4650 } 4745 }
4651 4746
4652 void AccountTrackerService::LoadFromPrefs() { 4747 void AccountTrackerService::LoadFromPrefs() {
4653- const base::ListValue* list = pref_service_->GetList(prefs::kAccountInfo); 4748- const base::Value* list = pref_service_->GetList(prefs::kAccountInfo);
4654 std::set<CoreAccountId> to_remove; 4749- std::set<CoreAccountId> to_remove;
4655- for (size_t i = 0; i < list->GetList().size(); ++i) { 4750- for (size_t i = 0; i < list->GetListDeprecated().size(); ++i) {
4656+ for (size_t i = 0; false; ++i) { 4751- const base::Value& dict_value = list->GetListDeprecated()[i];
4657 const base::DictionaryValue* dict = nullptr; 4752- if (dict_value.is_dict()) {
4658- if (list->GetDictionary(i, &dict)) { 4753- const base::DictionaryValue& dict =
4659+ if (false) { 4754- base::Value::AsDictionaryValue(dict_value);
4660 std::string value; 4755- if (const std::string* account_key =
4661 if (dict->GetString(kAccountKeyPath, &value)) { 4756- dict.FindStringKey(kAccountKeyPath)) {
4662 // Ignore incorrectly persisted non-canonical account ids. 4757- // Ignore incorrectly persisted non-canonical account ids.
4663@@ -588,14 +564,6 @@ void AccountTrackerService::LoadFromPref 4758- if (account_key->find('@') != std::string::npos &&
4664 account_info.is_child_account = is_child_status.value() 4759- *account_key != gaia::CanonicalizeEmail(*account_key)) {
4665 ? signin::Tribool::kTrue 4760- to_remove.insert(CoreAccountId::FromString(*account_key));
4666 : signin::Tribool::kFalse; 4761- continue;
4762- }
4763-
4764- CoreAccountId account_id = CoreAccountId::FromString(*account_key);
4765- StartTrackingAccount(account_id);
4766- AccountInfo& account_info = accounts_[account_id];
4767-
4768- GetString(dict, kAccountGaiaPath, account_info.gaia);
4769- GetString(dict, kAccountEmailPath, account_info.email);
4770- GetString(dict, kAccountHostedDomainPath, account_info.hosted_domain);
4771- GetString(dict, kAccountFullNamePath, account_info.full_name);
4772- GetString(dict, kAccountGivenNamePath, account_info.given_name);
4773- GetString(dict, kAccountLocalePath, account_info.locale);
4774- GetString(dict, kAccountPictureURLPath, account_info.picture_url);
4775- GetString(dict, kLastDownloadedImageURLWithSizePath,
4776- account_info.last_downloaded_image_url_with_size);
4777-
4778- if (absl::optional<bool> is_child_status =
4779- dict.FindBoolKey(kDeprecatedChildStatusPath)) {
4780- account_info.is_child_account = is_child_status.value()
4781- ? signin::Tribool::kTrue
4782- : signin::Tribool::kFalse;
4667- // Migrate to kAccountChildAttributePath. 4783- // Migrate to kAccountChildAttributePath.
4668- ListPrefUpdate update(pref_service_, prefs::kAccountInfo); 4784- ListPrefUpdate update(pref_service_, prefs::kAccountInfo);
4669- base::DictionaryValue* update_dict = nullptr; 4785- base::Value* update_dict = &update->GetListDeprecated()[i];
4670- update->GetDictionary(i, &update_dict); 4786- DCHECK(update_dict->is_dict());
4671- DCHECK(update_dict); 4787- update_dict->SetIntPath(
4672- SetAccountCapabilityPath(update_dict, kAccountChildAttributePath, 4788- kAccountChildAttributePath,
4673- account_info.is_child_account); 4789- static_cast<int>(account_info.is_child_account));
4674- update_dict->RemoveKey(kDeprecatedChildStatusPath); 4790- update_dict->RemoveKey(kDeprecatedChildStatusPath);
4675 } else { 4791- } else {
4676 account_info.is_child_account = 4792- account_info.is_child_account =
4677 FindAccountCapabilityPath(*dict, kAccountChildAttributePath); 4793- ParseTribool(dict.FindIntPath(kAccountChildAttributePath));
4678@@ -654,13 +622,11 @@ void AccountTrackerService::LoadFromPref 4794- }
4795-
4796- absl::optional<bool> is_under_advanced_protection =
4797- dict.FindBoolKey(kAdvancedProtectionAccountStatusPath);
4798- if (is_under_advanced_protection.has_value()) {
4799- account_info.is_under_advanced_protection =
4800- is_under_advanced_protection.value();
4801- }
4802-
4803- if (absl::optional<int> can_offer_extended_chrome_sync_promos =
4804- dict.FindIntPath(
4805- kDeprecatedCanOfferExtendedChromeSyncPromosPrefPath)) {
4806- // Migrate to Capability names based pref paths.
4807- ListPrefUpdate update(pref_service_, prefs::kAccountInfo);
4808- base::Value* update_dict = &update->GetListDeprecated()[i];
4809- DCHECK(update_dict->is_dict());
4810- SetAccountCapabilityState(
4811- update_dict, kCanOfferExtendedChromeSyncPromosCapabilityName,
4812- ParseTribool(can_offer_extended_chrome_sync_promos));
4813- update_dict->RemovePath(
4814- kDeprecatedCanOfferExtendedChromeSyncPromosPrefPath);
4815- }
4816-
4817- for (const std::string& name :
4818- AccountCapabilities::GetSupportedAccountCapabilityNames()) {
4819- switch (FindAccountCapabilityState(dict, name)) {
4820- case signin::Tribool::kUnknown:
4821- account_info.capabilities.capabilities_map_.erase(name);
4822- break;
4823- case signin::Tribool::kTrue:
4824- account_info.capabilities.capabilities_map_[name] = true;
4825- break;
4826- case signin::Tribool::kFalse:
4827- account_info.capabilities.capabilities_map_[name] = false;
4828- break;
4829- }
4830- }
4831-
4832- if (!account_info.gaia.empty())
4833- NotifyAccountUpdated(account_info);
4834- }
4835- }
4836- }
4837-
4838- // Remove any obsolete prefs.
4839- for (auto account_id : to_remove) {
4840- AccountInfo account_info;
4841- account_info.account_id = account_id;
4842- RemoveFromPrefs(account_info);
4843- RemoveAccountImageFromDisk(account_id);
4844- }
4845-
4846- if (GetMigrationState() != MIGRATION_DONE) {
4847- const AccountIdMigrationState new_state = ComputeNewMigrationState();
4848- SetMigrationState(new_state);
4849-
4850- if (new_state == MIGRATION_IN_PROGRESS) {
4851- MigrateToGaiaId();
4852- }
4853- }
4854-
4855- DCHECK(GetMigrationState() != MIGRATION_DONE || AreAllAccountsMigrated());
4856- UMA_HISTOGRAM_ENUMERATION("Signin.AccountTracker.GaiaIdMigrationState",
4857- GetMigrationState(), NUM_MIGRATION_STATES);
4858-
4859- UMA_HISTOGRAM_COUNTS_100("Signin.AccountTracker.CountOfLoadedAccounts",
4860- accounts_.size());
4679 } 4861 }
4680 4862
4681 void AccountTrackerService::SaveToPrefs(const AccountInfo& account_info) { 4863 void AccountTrackerService::SaveToPrefs(const AccountInfo& account_info) {
4682- if (!pref_service_) 4864- if (!pref_service_)
4683- return; 4865- return;
4684+ return; 4866-
4685 4867- base::DictionaryValue* dict = nullptr;
4686 base::DictionaryValue* dict = nullptr;
4687- ListPrefUpdate update(pref_service_, prefs::kAccountInfo); 4868- ListPrefUpdate update(pref_service_, prefs::kAccountInfo);
4688- for (size_t i = 0; i < update->GetList().size(); ++i, dict = nullptr) { 4869- for (size_t i = 0; i < update->GetListDeprecated().size();
4689- if (update->GetDictionary(i, &dict)) { 4870- ++i, dict = nullptr) {
4690+ if (false) { 4871- base::Value& dict_value = update->GetListDeprecated()[i];
4691+ while (false) { 4872- if (dict_value.is_dict()) {
4692 std::string value; 4873- dict = static_cast<base::DictionaryValue*>(&dict_value);
4693 if (dict->GetString(kAccountKeyPath, &value) && 4874- const std::string* account_key = dict->FindStringKey(kAccountKeyPath);
4694 value == account_info.account_id.ToString()) 4875- if (account_key && *account_key == account_info.account_id.ToString()) {
4695@@ -670,9 +636,6 @@ void AccountTrackerService::SaveToPrefs( 4876- break;
4696 4877- }
4697 if (!dict) { 4878- }
4698 dict = new base::DictionaryValue(); 4879- }
4699- update->Append(base::WrapUnique(dict)); 4880-
4700- // |dict| is invalidated at this point, so it needs to be reset. 4881- if (!dict) {
4701- update->GetDictionary(update->GetList().size() - 1, &dict); 4882- update->Append(base::Value(base::Value::Type::DICTIONARY));
4702 dict->SetString(kAccountKeyPath, account_info.account_id.ToString()); 4883- base::Value& dict_value = update->GetListDeprecated().back();
4703 } 4884- DCHECK(dict_value.is_dict());
4885- dict = static_cast<base::DictionaryValue*>(&dict_value);
4886- dict->SetString(kAccountKeyPath, account_info.account_id.ToString());
4887- }
4888-
4889- dict->SetString(kAccountEmailPath, account_info.email);
4890- dict->SetString(kAccountGaiaPath, account_info.gaia);
4891- dict->SetString(kAccountHostedDomainPath, account_info.hosted_domain);
4892- dict->SetString(kAccountFullNamePath, account_info.full_name);
4893- dict->SetString(kAccountGivenNamePath, account_info.given_name);
4894- dict->SetString(kAccountLocalePath, account_info.locale);
4895- dict->SetString(kAccountPictureURLPath, account_info.picture_url);
4896- dict->SetIntPath(kAccountChildAttributePath,
4897- static_cast<int>(account_info.is_child_account));
4898- dict->SetBoolean(kAdvancedProtectionAccountStatusPath,
4899- account_info.is_under_advanced_protection);
4900- // |kLastDownloadedImageURLWithSizePath| should only be set after the GAIA
4901- // picture is successufly saved to disk. Otherwise, there is no guarantee that
4902- // |kLastDownloadedImageURLWithSizePath| matches the picture on disk.
4903- for (const std::string& name :
4904- AccountCapabilities::GetSupportedAccountCapabilityNames()) {
4905- signin::Tribool capability_state =
4906- account_info.capabilities.GetCapabilityByName(name);
4907- SetAccountCapabilityState(dict, name, capability_state);
4908- }
4909 }
4704 4910
4705@@ -699,14 +662,7 @@ void AccountTrackerService::RemoveFromPr 4911 void AccountTrackerService::RemoveFromPrefs(const AccountInfo& account_info) {
4706 if (!pref_service_) 4912 if (!pref_service_)
4707 return; 4913 return;
4708 4914
@@ -4717,9 +4923,9 @@
4717 } 4923 }
4718 4924
4719 CoreAccountId AccountTrackerService::PickAccountIdForAccount( 4925 CoreAccountId AccountTrackerService::PickAccountIdForAccount(
4720--- components/signin/internal/identity_manager/account_tracker_service.h.orig 4926--- a/components/signin/internal/identity_manager/account_tracker_service.h
4721+++ components/signin/internal/identity_manager/account_tracker_service.h 4927+++ b/components/signin/internal/identity_manager/account_tracker_service.h
4722@@ -236,6 +236,8 @@ class AccountTrackerService { 4928@@ -235,6 +235,8 @@ class AccountTrackerService {
4723 AccountInfoCallback on_account_updated_callback_; 4929 AccountInfoCallback on_account_updated_callback_;
4724 AccountInfoCallback on_account_removed_callback_; 4930 AccountInfoCallback on_account_removed_callback_;
4725 4931
@@ -4728,18 +4934,18 @@
4728 // Task runner used for file operations on avatar images. 4934 // Task runner used for file operations on avatar images.
4729 scoped_refptr<base::SequencedTaskRunner> image_storage_task_runner_; 4935 scoped_refptr<base::SequencedTaskRunner> image_storage_task_runner_;
4730 4936
4731--- components/signin/internal/identity_manager/account_tracker_service_unittest.cc.orig 4937--- a/components/signin/internal/identity_manager/account_tracker_service_unittest.cc
4732+++ components/signin/internal/identity_manager/account_tracker_service_unittest.cc 4938+++ b/components/signin/internal/identity_manager/account_tracker_service_unittest.cc
4733@@ -26,7 +26,6 @@ 4939@@ -28,7 +28,6 @@
4734 #include "components/signin/internal/identity_manager/account_tracker_service.h" 4940 #include "components/signin/internal/identity_manager/fake_account_capabilities_fetcher_factory.h"
4735 #include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service.h" 4941 #include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service.h"
4736 #include "components/signin/public/base/avatar_icon_util.h" 4942 #include "components/signin/public/base/avatar_icon_util.h"
4737-#include "components/signin/public/base/signin_pref_names.h" 4943-#include "components/signin/public/base/signin_pref_names.h"
4738 #include "components/signin/public/base/signin_switches.h" 4944 #include "components/signin/public/base/signin_switches.h"
4739 #include "components/signin/public/base/test_signin_client.h" 4945 #include "components/signin/public/base/test_signin_client.h"
4740 #include "components/signin/public/identity_manager/account_capabilities.h" 4946 #include "components/signin/public/identity_manager/account_capabilities.h"
4741--- components/signin/internal/identity_manager/gaia_cookie_manager_service.cc.orig 4947--- a/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc
4742+++ components/signin/internal/identity_manager/gaia_cookie_manager_service.cc 4948+++ b/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc
4743@@ -29,7 +29,6 @@ 4949@@ -29,7 +29,6 @@
4744 #include "components/signin/internal/identity_manager/ubertoken_fetcher_impl.h" 4950 #include "components/signin/internal/identity_manager/ubertoken_fetcher_impl.h"
4745 #include "components/signin/public/base/signin_buildflags.h" 4951 #include "components/signin/public/base/signin_buildflags.h"
@@ -4748,7 +4954,7 @@
4748 #include "components/signin/public/identity_manager/set_accounts_in_cookie_result.h" 4954 #include "components/signin/public/identity_manager/set_accounts_in_cookie_result.h"
4749 #include "google_apis/gaia/gaia_constants.h" 4955 #include "google_apis/gaia/gaia_constants.h"
4750 #include "google_apis/gaia/gaia_urls.h" 4956 #include "google_apis/gaia/gaia_urls.h"
4751@@ -456,9 +455,7 @@ GaiaCookieManagerService::GaiaCookieMana 4957@@ -451,9 +450,7 @@ GaiaCookieManagerService::GaiaCookieMana
4752 listAccountsUnexpectedServerResponseRetried_(false), 4958 listAccountsUnexpectedServerResponseRetried_(false),
4753 external_cc_result_fetched_(false), 4959 external_cc_result_fetched_(false),
4754 list_accounts_stale_(true) { 4960 list_accounts_stale_(true) {
@@ -4759,7 +4965,7 @@
4759 4965
4760 if (!gaia_cookie_last_list_accounts_data.empty()) { 4966 if (!gaia_cookie_last_list_accounts_data.empty()) {
4761 if (!gaia::ParseListAccountsData(gaia_cookie_last_list_accounts_data, 4967 if (!gaia::ParseListAccountsData(gaia_cookie_last_list_accounts_data,
4762@@ -482,8 +479,6 @@ GaiaCookieManagerService::~GaiaCookieMan 4968@@ -477,8 +474,6 @@ GaiaCookieManagerService::~GaiaCookieMan
4763 4969
4764 // static 4970 // static
4765 void GaiaCookieManagerService::RegisterPrefs(PrefRegistrySimple* registry) { 4971 void GaiaCookieManagerService::RegisterPrefs(PrefRegistrySimple* registry) {
@@ -4768,7 +4974,7 @@
4768 } 4974 }
4769 4975
4770 void GaiaCookieManagerService::InitCookieListener() { 4976 void GaiaCookieManagerService::InitCookieListener() {
4771@@ -906,16 +901,12 @@ void GaiaCookieManagerService::OnListAcc 4977@@ -896,16 +891,12 @@ void GaiaCookieManagerService::OnListAcc
4772 &signed_out_accounts_)) { 4978 &signed_out_accounts_)) {
4773 listed_accounts_.clear(); 4979 listed_accounts_.clear();
4774 signed_out_accounts_.clear(); 4980 signed_out_accounts_.clear();
@@ -4785,9 +4991,9 @@
4785 RecordListAccountsFailure(GoogleServiceAuthError::NONE); 4991 RecordListAccountsFailure(GoogleServiceAuthError::NONE);
4786 4992
4787 InitializeListedAccountsIds(); 4993 InitializeListedAccountsIds();
4788--- components/signin/internal/identity_manager/gaia_cookie_manager_service_unittest.cc.orig 4994--- a/components/signin/internal/identity_manager/gaia_cookie_manager_service_unittest.cc
4789+++ components/signin/internal/identity_manager/gaia_cookie_manager_service_unittest.cc 4995+++ b/components/signin/internal/identity_manager/gaia_cookie_manager_service_unittest.cc
4790@@ -25,7 +25,6 @@ 4996@@ -24,7 +24,6 @@
4791 #include "components/prefs/testing_pref_service.h" 4997 #include "components/prefs/testing_pref_service.h"
4792 #include "components/signin/internal/identity_manager/account_tracker_service.h" 4998 #include "components/signin/internal/identity_manager/account_tracker_service.h"
4793 #include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service.h" 4999 #include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service.h"
@@ -4795,8 +5001,8 @@
4795 #include "components/signin/public/base/test_signin_client.h" 5001 #include "components/signin/public/base/test_signin_client.h"
4796 #include "google_apis/gaia/gaia_constants.h" 5002 #include "google_apis/gaia/gaia_constants.h"
4797 #include "google_apis/gaia/gaia_urls.h" 5003 #include "google_apis/gaia/gaia_urls.h"
4798--- components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc.orig 5004--- a/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc
4799+++ components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc 5005+++ b/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc
4800@@ -17,7 +17,6 @@ 5006@@ -17,7 +17,6 @@
4801 #include "components/prefs/pref_service.h" 5007 #include "components/prefs/pref_service.h"
4802 #include "components/signin/public/base/signin_client.h" 5008 #include "components/signin/public/base/signin_client.h"
@@ -4851,8 +5057,8 @@
4851- client_->GetPrefs()->SetBoolean(prefs::kTokenServiceDiceCompatible, true); 5057- client_->GetPrefs()->SetBoolean(prefs::kTokenServiceDiceCompatible, true);
4852 } 5058 }
4853 } 5059 }
4854--- components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc.orig 5060--- a/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc
4855+++ components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc 5061+++ b/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc
4856@@ -25,7 +25,6 @@ 5062@@ -25,7 +25,6 @@
4857 #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h" 5063 #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h"
4858 #include "components/signin/public/base/account_consistency_method.h" 5064 #include "components/signin/public/base/account_consistency_method.h"
@@ -4861,8 +5067,8 @@
4861 #include "components/signin/public/base/test_signin_client.h" 5067 #include "components/signin/public/base/test_signin_client.h"
4862 #include "components/signin/public/identity_manager/account_info.h" 5068 #include "components/signin/public/identity_manager/account_info.h"
4863 #include "components/signin/public/webdata/token_web_data.h" 5069 #include "components/signin/public/webdata/token_web_data.h"
4864--- components/signin/internal/identity_manager/primary_account_manager.cc.orig 5070--- a/components/signin/internal/identity_manager/primary_account_manager.cc
4865+++ components/signin/internal/identity_manager/primary_account_manager.cc 5071+++ b/components/signin/internal/identity_manager/primary_account_manager.cc
4866@@ -22,7 +22,6 @@ 5072@@ -22,7 +22,6 @@
4867 #include "components/signin/public/base/account_consistency_method.h" 5073 #include "components/signin/public/base/account_consistency_method.h"
4868 #include "components/signin/public/base/signin_client.h" 5074 #include "components/signin/public/base/signin_client.h"
@@ -4871,7 +5077,7 @@
4871 #include "components/signin/public/base/signin_switches.h" 5077 #include "components/signin/public/base/signin_switches.h"
4872 5078
4873 using signin::PrimaryAccountChangeEvent; 5079 using signin::PrimaryAccountChangeEvent;
4874@@ -47,22 +46,10 @@ PrimaryAccountManager::~PrimaryAccountMa 5080@@ -44,22 +43,10 @@ PrimaryAccountManager::~PrimaryAccountMa
4875 5081
4876 // static 5082 // static
4877 void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) { 5083 void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
@@ -4894,7 +5100,7 @@
4894 } 5100 }
4895 5101
4896 void PrimaryAccountManager::Initialize(PrefService* local_state) { 5102 void PrimaryAccountManager::Initialize(PrefService* local_state) {
4897@@ -70,25 +57,7 @@ void PrimaryAccountManager::Initialize(P 5103@@ -67,25 +54,7 @@ void PrimaryAccountManager::Initialize(P
4898 DCHECK(!IsInitialized()); 5104 DCHECK(!IsInitialized());
4899 initialized_ = true; 5105 initialized_ = true;
4900 5106
@@ -4921,7 +5127,7 @@
4921 5127
4922 if (!pref_account_id.empty()) { 5128 if (!pref_account_id.empty()) {
4923 if (account_tracker_service_->GetMigrationState() == 5129 if (account_tracker_service_->GetMigrationState() ==
4924@@ -98,14 +67,11 @@ void PrimaryAccountManager::Initialize(P 5130@@ -95,14 +64,11 @@ void PrimaryAccountManager::Initialize(P
4925 // |account_info.gaia| could be empty if |account_id| is already gaia id. 5131 // |account_info.gaia| could be empty if |account_id| is already gaia id.
4926 if (!account_info.gaia.empty()) { 5132 if (!account_info.gaia.empty()) {
4927 pref_account_id = account_info.gaia; 5133 pref_account_id = account_info.gaia;
@@ -4937,7 +5143,7 @@
4937 CoreAccountId account_id = CoreAccountId::FromString(pref_account_id); 5143 CoreAccountId account_id = CoreAccountId::FromString(pref_account_id);
4938 CoreAccountInfo account_info = 5144 CoreAccountInfo account_info =
4939 account_tracker_service_->GetAccountInfo(account_id); 5145 account_tracker_service_->GetAccountInfo(account_id);
4940@@ -166,8 +132,7 @@ void PrimaryAccountManager::SetSyncPrima 5146@@ -176,8 +142,7 @@ void PrimaryAccountManager::SetSyncPrima
4941 5147
4942 #if DCHECK_IS_ON() 5148 #if DCHECK_IS_ON()
4943 { 5149 {
@@ -4947,7 +5153,7 @@
4947 bool consented_to_sync = 5153 bool consented_to_sync =
4948 client_->GetPrefs()->GetBoolean(prefs::kGoogleServicesConsentedToSync); 5154 client_->GetPrefs()->GetBoolean(prefs::kGoogleServicesConsentedToSync);
4949 5155
4950@@ -183,10 +148,6 @@ void PrimaryAccountManager::SetSyncPrima 5156@@ -193,10 +158,6 @@ void PrimaryAccountManager::SetSyncPrima
4951 // Go ahead and update the last signed in account info here as well. Once a 5157 // Go ahead and update the last signed in account info here as well. Once a
4952 // user is signed in the corresponding preferences should match. Doing it here 5158 // user is signed in the corresponding preferences should match. Doing it here
4953 // as opposed to on signin allows us to catch the upgrade scenario. 5159 // as opposed to on signin allows us to catch the upgrade scenario.
@@ -4958,7 +5164,7 @@
4958 5164
4959 // Commit primary sync account info immediately so that it does not get lost 5165 // Commit primary sync account info immediately so that it does not get lost
4960 // if Chrome crashes before the next commit interval. 5166 // if Chrome crashes before the next commit interval.
4961@@ -200,20 +161,11 @@ void PrimaryAccountManager::SetPrimaryAc 5167@@ -210,20 +171,11 @@ void PrimaryAccountManager::SetPrimaryAc
4962 5168
4963 PrefService* prefs = client_->GetPrefs(); 5169 PrefService* prefs = client_->GetPrefs();
4964 const std::string& account_id = primary_account_info_.account_id.ToString(); 5170 const std::string& account_id = primary_account_info_.account_id.ToString();
@@ -4980,27 +5186,27 @@
4980 if (primary_account_info().account_id.empty()) { 5186 if (primary_account_info().account_id.empty()) {
4981 DCHECK(!consented_pref); 5187 DCHECK(!consented_pref);
4982 return false; 5188 return false;
4983--- components/signin/internal/identity_manager/primary_account_manager_unittest.cc.orig 5189--- a/components/signin/internal/identity_manager/primary_account_manager_unittest.cc
4984+++ components/signin/internal/identity_manager/primary_account_manager_unittest.cc 5190+++ b/components/signin/internal/identity_manager/primary_account_manager_unittest.cc
4985@@ -24,7 +24,6 @@ 5191@@ -25,7 +25,6 @@
5192 #include "components/signin/internal/identity_manager/fake_account_capabilities_fetcher_factory.h"
4986 #include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service_delegate.h" 5193 #include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service_delegate.h"
4987 #include "components/signin/internal/identity_manager/primary_account_policy_manager.h"
4988 #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h" 5194 #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h"
4989-#include "components/signin/public/base/signin_pref_names.h" 5195-#include "components/signin/public/base/signin_pref_names.h"
4990 #include "components/signin/public/base/signin_switches.h" 5196 #include "components/signin/public/base/signin_switches.h"
4991 #include "components/signin/public/base/test_signin_client.h" 5197 #include "components/signin/public/base/test_signin_client.h"
4992 #include "components/sync_preferences/testing_pref_service_syncable.h" 5198 #include "components/sync_preferences/testing_pref_service_syncable.h"
4993--- components/signin/internal/identity_manager/primary_account_mutator_impl.cc.orig 5199--- a/components/signin/internal/identity_manager/primary_account_mutator_impl.cc
4994+++ components/signin/internal/identity_manager/primary_account_mutator_impl.cc 5200+++ b/components/signin/internal/identity_manager/primary_account_mutator_impl.cc
4995@@ -14,7 +14,6 @@ 5201@@ -15,7 +15,6 @@
4996 #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h" 5202 #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h"
4997 #include "components/signin/public/base/signin_buildflags.h" 5203 #include "components/signin/public/base/signin_buildflags.h"
4998 #include "components/signin/public/base/signin_metrics.h" 5204 #include "components/signin/public/base/signin_metrics.h"
4999-#include "components/signin/public/base/signin_pref_names.h" 5205-#include "components/signin/public/base/signin_pref_names.h"
5206 #include "components/signin/public/base/signin_switches.h"
5000 #include "google_apis/gaia/core_account_id.h" 5207 #include "google_apis/gaia/core_account_id.h"
5001 5208
5002 namespace signin { 5209@@ -60,7 +59,7 @@ PrimaryAccountMutatorImpl::SetPrimaryAcc
5003@@ -58,7 +57,7 @@ PrimaryAccountMutatorImpl::SetPrimaryAcc
5004 DCHECK(!account_info.gaia.empty()); 5210 DCHECK(!account_info.gaia.empty());
5005 5211
5006 #if !BUILDFLAG(IS_CHROMEOS_ASH) 5212 #if !BUILDFLAG(IS_CHROMEOS_ASH)
@@ -5009,59 +5215,8 @@
5009 #if BUILDFLAG(IS_CHROMEOS_LACROS) 5215 #if BUILDFLAG(IS_CHROMEOS_LACROS)
5010 // Check that `prefs::kSigninAllowed` has not been set to false in a context 5216 // Check that `prefs::kSigninAllowed` has not been set to false in a context
5011 // where Lacros wants to set a Primary Account. Lacros doesn't offer account 5217 // where Lacros wants to set a Primary Account. Lacros doesn't offer account
5012--- components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc.orig 5218--- a/components/signin/internal/identity_manager/profile_oauth2_token_service.cc
5013+++ components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc 5219+++ b/components/signin/internal/identity_manager/profile_oauth2_token_service.cc
5014@@ -10,7 +10,6 @@
5015 #include "components/signin/internal/identity_manager/primary_account_manager.h"
5016 #include "components/signin/public/base/signin_client.h"
5017 #include "components/signin/public/base/signin_metrics.h"
5018-#include "components/signin/public/base/signin_pref_names.h"
5019 #include "components/signin/public/identity_manager/account_info.h"
5020 #include "components/signin/public/identity_manager/identity_utils.h"
5021
5022@@ -28,18 +27,7 @@ void PrimaryAccountPolicyManagerImpl::In
5023 // local_state can be null during unit tests.
5024 if (local_state) {
5025 local_state_pref_registrar_.Init(local_state);
5026- local_state_pref_registrar_.Add(
5027- prefs::kGoogleServicesUsernamePattern,
5028- base::BindRepeating(&PrimaryAccountPolicyManagerImpl::
5029- OnGoogleServicesUsernamePatternChanged,
5030- weak_pointer_factory_.GetWeakPtr(),
5031- primary_account_manager));
5032 }
5033- signin_allowed_.Init(
5034- prefs::kSigninAllowed, client_->GetPrefs(),
5035- base::BindRepeating(
5036- &PrimaryAccountPolicyManagerImpl::OnSigninAllowedPrefChanged,
5037- base::Unretained(this), primary_account_manager));
5038
5039 CoreAccountInfo account_info = primary_account_manager->GetPrimaryAccountInfo(
5040 signin::ConsentLevel::kSync);
5041--- components/signin/internal/identity_manager/primary_account_policy_manager_impl.h.orig
5042+++ components/signin/internal/identity_manager/primary_account_policy_manager_impl.h
5043@@ -56,9 +56,6 @@ class PrimaryAccountPolicyManagerImpl :
5044 // profile-specific local prefs (like kGoogleServicesUsernamePattern).
5045 PrefChangeRegistrar local_state_pref_registrar_;
5046
5047- // Helper object to listen for changes to the signin allowed preference.
5048- BooleanPrefMember signin_allowed_;
5049-
5050 base::WeakPtrFactory<PrimaryAccountPolicyManagerImpl> weak_pointer_factory_{
5051 this};
5052 };
5053--- components/signin/internal/identity_manager/primary_account_policy_manager_impl_unittest.cc.orig
5054+++ components/signin/internal/identity_manager/primary_account_policy_manager_impl_unittest.cc
5055@@ -15,7 +15,6 @@
5056 #include "components/signin/internal/identity_manager/primary_account_policy_manager_impl.h"
5057 #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h"
5058 #include "components/signin/public/base/account_consistency_method.h"
5059-#include "components/signin/public/base/signin_pref_names.h"
5060 #include "components/signin/public/base/test_signin_client.h"
5061 #include "components/sync_preferences/testing_pref_service_syncable.h"
5062 #include "testing/gtest/include/gtest/gtest.h"
5063--- components/signin/internal/identity_manager/profile_oauth2_token_service.cc.orig
5064+++ components/signin/internal/identity_manager/profile_oauth2_token_service.cc
5065@@ -12,7 +12,6 @@ 5220@@ -12,7 +12,6 @@
5066 #include "components/prefs/pref_registry_simple.h" 5221 #include "components/prefs/pref_registry_simple.h"
5067 #include "components/signin/internal/identity_manager/profile_oauth2_token_service_delegate.h" 5222 #include "components/signin/internal/identity_manager/profile_oauth2_token_service_delegate.h"
@@ -5079,9 +5234,9 @@
5079 } 5234 }
5080 5235
5081 ProfileOAuth2TokenServiceDelegate* ProfileOAuth2TokenService::GetDelegate() { 5236 ProfileOAuth2TokenServiceDelegate* ProfileOAuth2TokenService::GetDelegate() {
5082--- components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc.orig 5237--- a/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc
5083+++ components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc 5238+++ b/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc
5084@@ -25,7 +25,6 @@ 5239@@ -24,7 +24,6 @@
5085 #include "components/account_manager_core/mock_account_manager_facade.h" 5240 #include "components/account_manager_core/mock_account_manager_facade.h"
5086 #include "components/signin/internal/identity_manager/account_tracker_service.h" 5241 #include "components/signin/internal/identity_manager/account_tracker_service.h"
5087 #include "components/signin/internal/identity_manager/profile_oauth2_token_service_observer.h" 5242 #include "components/signin/internal/identity_manager/profile_oauth2_token_service_observer.h"
@@ -5089,8 +5244,8 @@
5089 #include "components/signin/public/base/test_signin_client.h" 5244 #include "components/signin/public/base/test_signin_client.h"
5090 #include "components/signin/public/identity_manager/account_info.h" 5245 #include "components/signin/public/identity_manager/account_info.h"
5091 #include "components/sync_preferences/testing_pref_service_syncable.h" 5246 #include "components/sync_preferences/testing_pref_service_syncable.h"
5092--- components/signin/public/base/BUILD.gn.orig 5247--- a/components/signin/public/base/BUILD.gn
5093+++ components/signin/public/base/BUILD.gn 5248+++ b/components/signin/public/base/BUILD.gn
5094@@ -34,8 +34,6 @@ static_library("base") { 5249@@ -34,8 +34,6 @@ static_library("base") {
5095 "signin_client.h", 5250 "signin_client.h",
5096 "signin_metrics.cc", 5251 "signin_metrics.cc",
@@ -5100,8 +5255,8 @@
5100 "signin_switches.cc", 5255 "signin_switches.cc",
5101 "signin_switches.h", 5256 "signin_switches.h",
5102 ] 5257 ]
5103--- components/signin/public/base/device_id_helper.cc.orig 5258--- a/components/signin/public/base/device_id_helper.cc
5104+++ components/signin/public/base/device_id_helper.cc 5259+++ b/components/signin/public/base/device_id_helper.cc
5105@@ -9,7 +9,6 @@ 5260@@ -9,7 +9,6 @@
5106 #include "base/guid.h" 5261 #include "base/guid.h"
5107 #include "build/chromeos_buildflags.h" 5262 #include "build/chromeos_buildflags.h"
@@ -5146,8 +5301,8 @@
5146 } 5301 }
5147 5302
5148 #endif 5303 #endif
5149--- components/signin/public/base/device_id_helper_unittest.cc.orig 5304--- a/components/signin/public/base/device_id_helper_unittest.cc
5150+++ components/signin/public/base/device_id_helper_unittest.cc 5305+++ b/components/signin/public/base/device_id_helper_unittest.cc
5151@@ -8,7 +8,6 @@ 5306@@ -8,7 +8,6 @@
5152 5307
5153 #include "build/build_config.h" 5308 #include "build/build_config.h"
@@ -5197,8 +5352,8 @@
5197 } 5352 }
5198 5353
5199 #endif 5354 #endif
5200--- components/signin/public/identity_manager/identity_utils.cc.orig 5355--- a/components/signin/public/identity_manager/identity_utils.cc
5201+++ components/signin/public/identity_manager/identity_utils.cc 5356+++ b/components/signin/public/identity_manager/identity_utils.cc
5202@@ -11,7 +11,6 @@ 5357@@ -11,7 +11,6 @@
5203 #include "base/strings/string_util.h" 5358 #include "base/strings/string_util.h"
5204 #include "base/strings/utf_string_conversions.h" 5359 #include "base/strings/utf_string_conversions.h"
@@ -5217,8 +5372,8 @@
5217 } 5372 }
5218 5373
5219 } // namespace signin 5374 } // namespace signin
5220--- components/signin/public/identity_manager/identity_utils_unittest.cc.orig 5375--- a/components/signin/public/identity_manager/identity_utils_unittest.cc
5221+++ components/signin/public/identity_manager/identity_utils_unittest.cc 5376+++ b/components/signin/public/identity_manager/identity_utils_unittest.cc
5222@@ -7,7 +7,6 @@ 5377@@ -7,7 +7,6 @@
5223 #include "components/prefs/pref_registry_simple.h" 5378 #include "components/prefs/pref_registry_simple.h"
5224 #include "components/prefs/pref_service.h" 5379 #include "components/prefs/pref_service.h"
@@ -5227,19 +5382,19 @@
5227 #include "testing/gtest/include/gtest/gtest.h" 5382 #include "testing/gtest/include/gtest/gtest.h"
5228 5383
5229 namespace { 5384 namespace {
5230--- components/signin/public/identity_manager/primary_account_mutator_unittest.cc.orig 5385--- a/components/signin/public/identity_manager/primary_account_mutator_unittest.cc
5231+++ components/signin/public/identity_manager/primary_account_mutator_unittest.cc 5386+++ b/components/signin/public/identity_manager/primary_account_mutator_unittest.cc
5232@@ -15,7 +15,6 @@ 5387@@ -16,7 +16,6 @@
5233 #include "build/chromeos_buildflags.h" 5388 #include "components/signin/public/base/consent_level.h"
5234 #include "components/signin/public/base/signin_buildflags.h" 5389 #include "components/signin/public/base/signin_buildflags.h"
5235 #include "components/signin/public/base/signin_metrics.h" 5390 #include "components/signin/public/base/signin_metrics.h"
5236-#include "components/signin/public/base/signin_pref_names.h" 5391-#include "components/signin/public/base/signin_pref_names.h"
5237 #include "components/signin/public/identity_manager/consent_level.h" 5392 #include "components/signin/public/base/signin_switches.h"
5238 #include "components/signin/public/identity_manager/identity_test_environment.h" 5393 #include "components/signin/public/identity_manager/identity_test_environment.h"
5239 #include "components/signin/public/identity_manager/identity_test_utils.h" 5394 #include "components/signin/public/identity_manager/identity_test_utils.h"
5240--- tools/metrics/histograms/enums.xml.orig 5395--- a/tools/metrics/histograms/enums.xml
5241+++ tools/metrics/histograms/enums.xml 5396+++ b/tools/metrics/histograms/enums.xml
5242@@ -83754,7 +83754,6 @@ Full version information for the fingerp 5397@@ -90465,7 +90465,6 @@ Full version information for the fingerp
5243 <int value="3" label="kRestoreOnStartup"/> 5398 <int value="3" label="kRestoreOnStartup"/>
5244 <int value="4" label="kURLsToRestoreOnStartup"/> 5399 <int value="4" label="kURLsToRestoreOnStartup"/>
5245 <int value="5" label="extensions::pref_names::kExtensions"/> 5400 <int value="5" label="extensions::pref_names::kExtensions"/>
@@ -5247,7 +5402,7 @@
5247 <int value="7" label="kSearchProviderOverrides"/> 5402 <int value="7" label="kSearchProviderOverrides"/>
5248 <int value="8" label="kDefaultSearchProviderSearchURL (Obsolete 12/2016)"/> 5403 <int value="8" label="kDefaultSearchProviderSearchURL (Obsolete 12/2016)"/>
5249 <int value="9" label="kDefaultSearchProviderKeyword (Obsolete 12/2016)"/> 5404 <int value="9" label="kDefaultSearchProviderKeyword (Obsolete 12/2016)"/>
5250@@ -83769,10 +83768,7 @@ Full version information for the fingerp 5405@@ -90480,10 +90479,7 @@ Full version information for the fingerp
5251 <int value="18" label="kSafeBrowsingIncidentsSent"/> 5406 <int value="18" label="kSafeBrowsingIncidentsSent"/>
5252 <int value="19" label="kSwReporterPromptVersion"/> 5407 <int value="19" label="kSwReporterPromptVersion"/>
5253 <int value="20" label="kSwReporterPromptReason"/> 5408 <int value="20" label="kSwReporterPromptReason"/>
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch b/www/chromium-uc/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch
index 0ef3743..499eab4 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch
@@ -1,17 +1,18 @@
1--- components/search_engines/prepopulated_engines.json.orig 1--- a/components/search_engines/prepopulated_engines.json
2+++ components/search_engines/prepopulated_engines.json 2+++ b/components/search_engines/prepopulated_engines.json
3@@ -113,21 +113,11 @@ 3@@ -113,22 +113,11 @@
4 }, 4 },
5 5
6 "google": { 6 "google": {
7- "name": "Google", 7- "name": "Google",
8- "keyword": "google.com", 8- "keyword": "google.com",
9- "favicon_url": "https://www.google.com/images/branding/product/ico/googleg_lodp.ico", 9- "favicon_url": "https://www.google.com/images/branding/product/ico/googleg_lodp.ico",
10- "search_url": "{google:baseURL}search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:iOSSearchLanguage}{google:prefetchSource}{google:searchClient}{google:sourceId}{google:contextualSearchVersion}ie={inputEncoding}", 10- "search_url": "{google:baseURL}search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchboxStats}{google:searchFieldtrialParameter}{google:iOSSearchLanguage}{google:prefetchSource}{google:searchClient}{google:sourceId}{google:contextualSearchVersion}ie={inputEncoding}",
11- "suggest_url": "{google:baseSuggestURL}search?{google:searchFieldtrialParameter}client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:omniboxFocusType}{google:cursorPosition}{google:currentPageUrl}{google:pageClassification}{google:searchVersion}{google:sessionToken}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}", 11- "suggest_url": "{google:baseSuggestURL}search?{google:searchFieldtrialParameter}client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:omniboxFocusType}{google:cursorPosition}{google:currentPageUrl}{google:pageClassification}{google:clientCacheTimeToLive}{google:searchVersion}{google:sessionToken}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}",
12- "image_url": "{google:baseSearchByImageURL}upload", 12- "image_url": "{google:baseSearchByImageURL}upload",
13- "contextual_search_url": "{google:baseURL}_/contextualsearch?{google:contextualSearchVersion}{google:contextualSearchContextData}", 13- "contextual_search_url": "{google:baseURL}_/contextualsearch?{google:contextualSearchVersion}{google:contextualSearchContextData}",
14- "image_url_post_params": "encoded_image={google:imageThumbnail},image_url={google:imageURL},sbisrc={google:imageSearchSource},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight}", 14- "image_url_post_params": "encoded_image={google:imageThumbnail},image_url={google:imageURL},sbisrc={google:imageSearchSource},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight}",
15- "side_search_param": "sidesearch",
15- "alternate_urls": [ 16- "alternate_urls": [
16- "{google:baseURL}#q={searchTerms}", 17- "{google:baseURL}#q={searchTerms}",
17- "{google:baseURL}search#q={searchTerms}", 18- "{google:baseURL}search#q={searchTerms}",
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch b/www/chromium-uc/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch
index 50efc58..86640b5 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch
@@ -1,7 +1,7 @@
1# Disables translation and removes the "Translate to" context menu when --translate-script-url flag is not set 1# Disables translation and removes the "Translate to" context menu when --translate-script-url flag is not set
2--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
3+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc 3+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
4@@ -133,6 +133,7 @@ 4@@ -135,6 +135,7 @@
5 #include "components/spellcheck/common/spellcheck_common.h" 5 #include "components/spellcheck/common/spellcheck_common.h"
6 #include "components/spellcheck/spellcheck_buildflags.h" 6 #include "components/spellcheck/spellcheck_buildflags.h"
7 #include "components/strings/grit/components_strings.h" 7 #include "components/strings/grit/components_strings.h"
@@ -9,7 +9,7 @@
9 #include "components/translate/core/browser/translate_download_manager.h" 9 #include "components/translate/core/browser/translate_download_manager.h"
10 #include "components/translate/core/browser/translate_manager.h" 10 #include "components/translate/core/browser/translate_manager.h"
11 #include "components/translate/core/browser/translate_prefs.h" 11 #include "components/translate/core/browser/translate_prefs.h"
12@@ -1751,6 +1752,8 @@ void RenderViewContextMenu::AppendPageIt 12@@ -1727,6 +1728,8 @@ void RenderViewContextMenu::AppendPageIt
13 menu_model_.AddSeparator(ui::NORMAL_SEPARATOR); 13 menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
14 } 14 }
15 15
@@ -18,7 +18,7 @@
18 ChromeTranslateClient* chrome_translate_client = 18 ChromeTranslateClient* chrome_translate_client =
19 ChromeTranslateClient::FromWebContents(embedder_web_contents_); 19 ChromeTranslateClient::FromWebContents(embedder_web_contents_);
20 const bool canTranslate = 20 const bool canTranslate =
21@@ -1772,6 +1775,7 @@ void RenderViewContextMenu::AppendPageIt 21@@ -1748,6 +1751,7 @@ void RenderViewContextMenu::AppendPageIt
22 IDC_CONTENT_CONTEXT_TRANSLATE, 22 IDC_CONTENT_CONTEXT_TRANSLATE,
23 l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_TRANSLATE, language)); 23 l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_TRANSLATE, language));
24 } 24 }
@@ -26,8 +26,8 @@
26 } 26 }
27 27
28 void RenderViewContextMenu::AppendExitFullscreenItem() { 28 void RenderViewContextMenu::AppendExitFullscreenItem() {
29--- components/translate/core/browser/translate_language_list.cc.orig 29--- a/components/translate/core/browser/translate_language_list.cc
30+++ components/translate/core/browser/translate_language_list.cc 30+++ b/components/translate/core/browser/translate_language_list.cc
31@@ -11,6 +11,7 @@ 31@@ -11,6 +11,7 @@
32 32
33 #include "base/bind.h" 33 #include "base/bind.h"
@@ -54,9 +54,9 @@
54 // If resource requests are not allowed, we'll get a callback when they are. 54 // If resource requests are not allowed, we'll get a callback when they are.
55 if (!resource_requests_allowed_) { 55 if (!resource_requests_allowed_) {
56 request_pending_ = true; 56 request_pending_ = true;
57--- components/translate/core/browser/translate_manager.cc.orig 57--- a/components/translate/core/browser/translate_manager.cc
58+++ components/translate/core/browser/translate_manager.cc 58+++ b/components/translate/core/browser/translate_manager.cc
59@@ -887,8 +887,9 @@ void TranslateManager::FilterIsTranslate 59@@ -880,8 +880,9 @@ void TranslateManager::FilterIsTranslate
60 ->LogAutofillAssistantDeferredTriggerDecision(); 60 ->LogAutofillAssistantDeferredTriggerDecision();
61 } 61 }
62 62
@@ -68,8 +68,8 @@
68 // Without an API key, translate won't work, so don't offer to translate in 68 // Without an API key, translate won't work, so don't offer to translate in
69 // the first place. Leave kOfferTranslateEnabled on, though, because that 69 // the first place. Leave kOfferTranslateEnabled on, though, because that
70 // settings syncs and we don't want to turn off translate everywhere else. 70 // settings syncs and we don't want to turn off translate everywhere else.
71--- components/translate/core/browser/translate_ranker_impl.cc.orig 71--- a/components/translate/core/browser/translate_ranker_impl.cc
72+++ components/translate/core/browser/translate_ranker_impl.cc 72+++ b/components/translate/core/browser/translate_ranker_impl.cc
73@@ -156,12 +156,9 @@ TranslateRankerImpl::TranslateRankerImpl 73@@ -156,12 +156,9 @@ TranslateRankerImpl::TranslateRankerImpl
74 ukm::UkmRecorder* ukm_recorder) 74 ukm::UkmRecorder* ukm_recorder)
75 : ukm_recorder_(ukm_recorder), 75 : ukm_recorder_(ukm_recorder),
@@ -95,8 +95,8 @@
95 translate_event->set_ranker_request_timestamp_sec( 95 translate_event->set_ranker_request_timestamp_sec(
96 (base::TimeTicks::Now() - base::TimeTicks()).InSeconds()); 96 (base::TimeTicks::Now() - base::TimeTicks()).InSeconds());
97 translate_event->set_ranker_version(GetModelVersion()); 97 translate_event->set_ranker_version(GetModelVersion());
98--- components/translate/core/browser/translate_script.cc.orig 98--- a/components/translate/core/browser/translate_script.cc
99+++ components/translate/core/browser/translate_script.cc 99+++ b/components/translate/core/browser/translate_script.cc
100@@ -137,8 +137,13 @@ void TranslateScript::OnScriptFetchCompl 100@@ -137,8 +137,13 @@ void TranslateScript::OnScriptFetchCompl
101 server_params.c_str()); 101 server_params.c_str());
102 102
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 05:47:24 +0000