summaryrefslogtreecommitdiff
path: root/www/chromium-uc/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium-uc/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch')
-rw-r--r--www/chromium-uc/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch1837
1 files changed, 859 insertions, 978 deletions
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 f530f4e..0527dde 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,8 +2,8 @@
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--- a/android_webview/browser/aw_browser_context.cc 5--- android_webview/browser/aw_browser_context.cc.orig
6+++ b/android_webview/browser/aw_browser_context.cc 6+++ android_webview/browser/aw_browser_context.cc
7@@ -49,7 +49,6 @@ 7@@ -49,7 +49,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"
@@ -11,8 +11,8 @@
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/variations/variations_client.h" 14 #include "components/visitedlink/browser/visitedlink_writer.h"
15@@ -520,8 +519,6 @@ void AwBrowserContext::RebuildTable( 15@@ -470,8 +469,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--- a/chrome/app/settings_strings.grdp 24--- chrome/app/settings_strings.grdp.orig
25+++ b/chrome/app/settings_strings.grdp 25+++ chrome/app/settings_strings.grdp
26@@ -1800,69 +1800,9 @@ 26@@ -1591,78 +1591,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,6 +33,9 @@
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>
36- <message name="IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC" desc="Description for extended safe browsing"> 39- <message name="IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC" desc="Description for extended safe browsing">
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. 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.
38- </message> 41- </message>
@@ -51,6 +54,9 @@
51- <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_ONE" desc="First bullet point under the safe browsing enhanced protection mode"> 54- <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_ONE" desc="First bullet point under the safe browsing enhanced protection mode">
52- Predicts and warns you about dangerous events before they happen 55- Predicts and warns you about dangerous events before they happen
53- </message> 56- </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>
54- <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_THREE" desc="Third bullet point under the safe browsing enhanced protection mode"> 60- <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_THREE" desc="Third bullet point under the safe browsing enhanced protection mode">
55- Improves security for you and everyone on the web 61- Improves security for you and everyone on the web
56- </message> 62- </message>
@@ -64,7 +70,7 @@
64- Standard protection 70- Standard protection
65- </message> 71- </message>
66- <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_DESC" desc="Description for safe browsing standard protection mode"> 72- <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_DESC" desc="Description for safe browsing standard protection mode">
67- Standard protection against websites, downloads, and extensions that are known to be dangerous 73- Standard protection against websites, downloads, and extensions that are known to be dangerous.
68- </message> 74- </message>
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."> 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.">
70- Show standard protection details 76- Show standard protection details
@@ -72,6 +78,9 @@
72- <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_ONE" desc="First bullet point under the safe browsing standard protection mode"> 78- <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_ONE" desc="First bullet point under the safe browsing standard protection mode">
73- Detects and warns you about dangerous events when they happen 79- Detects and warns you about dangerous events when they happen
74- </message> 80- </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>
75- <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_HELP_IMPROVE" desc="The name of the toggle to enable reporting to help improve safe browsing"> 84- <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_HELP_IMPROVE" desc="The name of the toggle to enable reporting to help improve safe browsing">
76- Help improve security on the web for everyone 85- Help improve security on the web for everyone
77- </message> 86- </message>
@@ -93,9 +102,9 @@
93 <message name="IDS_SETTINGS_ENABLE_DO_NOT_TRACK" desc="The label of the checkbox to enable/disable sending the 'Do Not track' header"> 102 <message name="IDS_SETTINGS_ENABLE_DO_NOT_TRACK" desc="The label of the checkbox to enable/disable sending the 'Do Not track' header">
94 Send a "Do Not Track" request with your browsing traffic 103 Send a "Do Not Track" request with your browsing traffic
95 </message> 104 </message>
96--- a/chrome/browser/android/signin/signin_manager_android.cc 105--- chrome/browser/android/signin/signin_manager_android.cc.orig
97+++ b/chrome/browser/android/signin/signin_manager_android.cc 106+++ chrome/browser/android/signin/signin_manager_android.cc
98@@ -15,7 +15,6 @@ 107@@ -14,7 +14,6 @@
99 #include "chrome/android/chrome_jni_headers/SigninManagerImpl_jni.h" 108 #include "chrome/android/chrome_jni_headers/SigninManagerImpl_jni.h"
100 #include "chrome/common/pref_names.h" 109 #include "chrome/common/pref_names.h"
101 #include "components/prefs/pref_service.h" 110 #include "components/prefs/pref_service.h"
@@ -103,7 +112,7 @@
103 #include "google_apis/gaia/gaia_auth_util.h" 112 #include "google_apis/gaia/gaia_auth_util.h"
104 113
105 #include "base/android/callback_android.h" 114 #include "base/android/callback_android.h"
106@@ -31,7 +30,6 @@ 115@@ -30,7 +29,6 @@
107 #include "components/policy/core/browser/browser_policy_connector.h" 116 #include "components/policy/core/browser/browser_policy_connector.h"
108 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" 117 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
109 #include "components/prefs/pref_service.h" 118 #include "components/prefs/pref_service.h"
@@ -111,7 +120,7 @@
111 #include "components/signin/public/identity_manager/accounts_cookie_mutator.h" 120 #include "components/signin/public/identity_manager/accounts_cookie_mutator.h"
112 #include "components/signin/public/identity_manager/identity_manager.h" 121 #include "components/signin/public/identity_manager/identity_manager.h"
113 #include "content/public/browser/browser_context.h" 122 #include "content/public/browser/browser_context.h"
114@@ -96,8 +94,6 @@ class ProfileDataRemover : public conten 123@@ -95,8 +93,6 @@ class ProfileDataRemover : public conten
115 // All the Profile data has been wiped. Clear the last signed in username 124 // All the Profile data has been wiped. Clear the last signed in username
116 // as well, so that the next signin doesn't trigger the account 125 // as well, so that the next signin doesn't trigger the account
117 // change dialog. 126 // change dialog.
@@ -120,7 +129,7 @@
120 } 129 }
121 130
122 origin_runner_->PostTask(FROM_HERE, std::move(callback_)); 131 origin_runner_->PostTask(FROM_HERE, std::move(callback_));
123@@ -133,11 +129,6 @@ SigninManagerAndroid::SigninManagerAndro 132@@ -132,11 +128,6 @@ SigninManagerAndroid::SigninManagerAndro
124 DCHECK(user_cloud_policy_manager_); 133 DCHECK(user_cloud_policy_manager_);
125 DCHECK(user_policy_signin_service_); 134 DCHECK(user_policy_signin_service_);
126 135
@@ -132,7 +141,7 @@
132 force_browser_signin_.Init(prefs::kForceBrowserSignin, 141 force_browser_signin_.Init(prefs::kForceBrowserSignin,
133 g_browser_process->local_state()); 142 g_browser_process->local_state());
134 143
135@@ -161,7 +152,7 @@ void SigninManagerAndroid::Shutdown() { 144@@ -160,7 +151,7 @@ void SigninManagerAndroid::Shutdown() {
136 } 145 }
137 146
138 bool SigninManagerAndroid::IsSigninAllowed() const { 147 bool SigninManagerAndroid::IsSigninAllowed() const {
@@ -141,11 +150,11 @@
141 } 150 }
142 151
143 jboolean SigninManagerAndroid::IsSigninAllowedByPolicy(JNIEnv* env) const { 152 jboolean SigninManagerAndroid::IsSigninAllowedByPolicy(JNIEnv* env) const {
144--- a/chrome/browser/android/signin/signin_manager_android.h 153--- chrome/browser/android/signin/signin_manager_android.h.orig
145+++ b/chrome/browser/android/signin/signin_manager_android.h 154+++ chrome/browser/android/signin/signin_manager_android.h
146@@ -117,9 +117,6 @@ class SigninManagerAndroid : public Keye 155@@ -117,9 +117,6 @@ class SigninManagerAndroid : public Keye
147 156
148 const raw_ptr<Profile> profile_ = nullptr; 157 Profile* const profile_ = nullptr;
149 158
150- // Handler for prefs::kSigninAllowed set in user's profile. 159- // Handler for prefs::kSigninAllowed set in user's profile.
151- BooleanPrefMember signin_allowed_; 160- BooleanPrefMember signin_allowed_;
@@ -153,8 +162,8 @@
153 // Handler for prefs::kForceBrowserSignin. This preference is set in Local 162 // Handler for prefs::kForceBrowserSignin. This preference is set in Local
154 // State, not in user prefs. 163 // State, not in user prefs.
155 BooleanPrefMember force_browser_signin_; 164 BooleanPrefMember force_browser_signin_;
156--- a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc 165--- chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc.orig
157+++ b/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
158@@ -18,7 +18,6 @@ 167@@ -18,7 +18,6 @@
159 #include "chrome/browser/profiles/profile_manager.h" 168 #include "chrome/browser/profiles/profile_manager.h"
160 #include "chrome/common/pref_names.h" 169 #include "chrome/common/pref_names.h"
@@ -172,18 +181,18 @@
172 return; 181 return;
173 } 182 }
174 183
175--- a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc 184--- chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc.orig
176+++ b/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
177@@ -37,7 +37,6 @@ 186@@ -37,7 +37,6 @@
178 #include "chromeos/dbus/dbus_thread_manager.h" 187 #include "components/arc/session/arc_session.h"
179 #include "components/crx_file/id_util.h" 188 #include "components/crx_file/id_util.h"
180 #include "components/prefs/pref_service.h" 189 #include "components/prefs/pref_service.h"
181-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 190-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
182 #include "content/public/test/browser_task_environment.h" 191 #include "content/public/test/browser_task_environment.h"
183 #include "extensions/common/extension.h" 192 #include "extensions/common/extension.h"
184 #include "extensions/common/extension_builder.h" 193 #include "extensions/common/extension_builder.h"
185--- a/chrome/browser/ash/login/signin/device_id_browsertest.cc 194--- chrome/browser/ash/login/signin/device_id_browsertest.cc.orig
186+++ b/chrome/browser/ash/login/signin/device_id_browsertest.cc 195+++ chrome/browser/ash/login/signin/device_id_browsertest.cc
187@@ -24,7 +24,6 @@ 196@@ -24,7 +24,6 @@
188 #include "chrome/common/chrome_switches.h" 197 #include "chrome/common/chrome_switches.h"
189 #include "chrome/test/base/in_process_browser_test.h" 198 #include "chrome/test/base/in_process_browser_test.h"
@@ -192,7 +201,7 @@
192 #include "components/user_manager/known_user.h" 201 #include "components/user_manager/known_user.h"
193 #include "components/user_manager/user_manager.h" 202 #include "components/user_manager/user_manager.h"
194 #include "content/public/test/browser_test.h" 203 #include "content/public/test/browser_test.h"
195@@ -248,15 +247,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE 204@@ -249,15 +248,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE
196 SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword, 205 SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword,
197 kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId); 206 kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId);
198 207
@@ -208,7 +217,7 @@
208 // Can't use SetKnownUserDeviceId here, because it forbids changing a device 217 // Can't use SetKnownUserDeviceId here, because it forbids changing a device
209 // ID. 218 // ID.
210 user_manager::known_user::SetStringPref( 219 user_manager::known_user::SetStringPref(
211@@ -281,13 +271,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE 220@@ -282,13 +272,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE
212 SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword, 221 SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword,
213 kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId); 222 kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId);
214 223
@@ -222,9 +231,9 @@
222 // Can't use SetKnownUserDeviceId here, because it forbids changing a device 231 // Can't use SetKnownUserDeviceId here, because it forbids changing a device
223 // ID. 232 // ID.
224 user_manager::known_user::SetStringPref( 233 user_manager::known_user::SetStringPref(
225--- a/chrome/browser/chrome_content_browser_client.cc 234--- chrome/browser/chrome_content_browser_client.cc.orig
226+++ b/chrome/browser/chrome_content_browser_client.cc 235+++ chrome/browser/chrome_content_browser_client.cc
227@@ -233,7 +233,6 @@ 236@@ -225,7 +225,6 @@
228 #include "components/safe_browsing/core/browser/realtime/url_lookup_service.h" 237 #include "components/safe_browsing/core/browser/realtime/url_lookup_service.h"
229 #include "components/safe_browsing/core/browser/url_checker_delegate.h" 238 #include "components/safe_browsing/core/browser/url_checker_delegate.h"
230 #include "components/safe_browsing/core/common/features.h" 239 #include "components/safe_browsing/core/common/features.h"
@@ -232,8 +241,8 @@
232 #include "components/security_interstitials/content/insecure_form_navigation_throttle.h" 241 #include "components/security_interstitials/content/insecure_form_navigation_throttle.h"
233 #include "components/security_interstitials/content/origin_policy_ui.h" 242 #include "components/security_interstitials/content/origin_policy_ui.h"
234 #include "components/security_interstitials/content/ssl_cert_reporter.h" 243 #include "components/security_interstitials/content/ssl_cert_reporter.h"
235--- a/chrome/browser/download/download_browsertest.cc 244--- chrome/browser/download/download_browsertest.cc.orig
236+++ b/chrome/browser/download/download_browsertest.cc 245+++ chrome/browser/download/download_browsertest.cc
237@@ -103,7 +103,6 @@ 246@@ -103,7 +103,6 @@
238 #include "components/safe_browsing/content/browser/safe_browsing_service_interface.h" 247 #include "components/safe_browsing/content/browser/safe_browsing_service_interface.h"
239 #include "components/safe_browsing/content/common/proto/download_file_types.pb.h" 248 #include "components/safe_browsing/content/common/proto/download_file_types.pb.h"
@@ -242,9 +251,9 @@
242 #include "components/security_state/core/features.h" 251 #include "components/security_state/core/features.h"
243 #include "components/security_state/core/security_state.h" 252 #include "components/security_state/core/security_state.h"
244 #include "components/services/quarantine/test_support.h" 253 #include "components/services/quarantine/test_support.h"
245--- a/chrome/browser/download/download_item_model.cc 254--- chrome/browser/download/download_item_model.cc.orig
246+++ b/chrome/browser/download/download_item_model.cc 255+++ chrome/browser/download/download_item_model.cc
247@@ -790,6 +790,7 @@ void DownloadItemModel::ExecuteCommand(D 256@@ -783,6 +783,7 @@ void DownloadItemModel::ExecuteCommand(D
248 DownloadUIModel::ExecuteCommand(download_commands, command); 257 DownloadUIModel::ExecuteCommand(download_commands, command);
249 break; 258 break;
250 case DownloadCommands::DEEP_SCAN: 259 case DownloadCommands::DEEP_SCAN:
@@ -252,7 +261,7 @@
252 safe_browsing::SafeBrowsingService* sb_service = 261 safe_browsing::SafeBrowsingService* sb_service =
253 g_browser_process->safe_browsing_service(); 262 g_browser_process->safe_browsing_service();
254 if (!sb_service) 263 if (!sb_service)
255@@ -815,6 +816,7 @@ void DownloadItemModel::ExecuteCommand(D 264@@ -808,6 +809,7 @@ void DownloadItemModel::ExecuteCommand(D
256 safe_browsing::DeepScanningRequest::DeepScanTrigger:: 265 safe_browsing::DeepScanningRequest::DeepScanTrigger::
257 TRIGGER_APP_PROMPT, 266 TRIGGER_APP_PROMPT,
258 safe_browsing::DownloadCheckResult::UNKNOWN, std::move(settings)); 267 safe_browsing::DownloadCheckResult::UNKNOWN, std::move(settings));
@@ -260,8 +269,8 @@
260 break; 269 break;
261 } 270 }
262 } 271 }
263--- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc 272--- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc.orig
264+++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc 273+++ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
265@@ -38,7 +38,6 @@ 274@@ -38,7 +38,6 @@
266 #include "components/policy/core/common/chrome_schema.h" 275 #include "components/policy/core/common/chrome_schema.h"
267 #include "components/prefs/pref_service.h" 276 #include "components/prefs/pref_service.h"
@@ -270,33 +279,35 @@
270 #include "components/url_matcher/url_matcher.h" 279 #include "components/url_matcher/url_matcher.h"
271 #include "content/public/browser/web_contents.h" 280 #include "content/public/browser/web_contents.h"
272 #include "crypto/secure_hash.h" 281 #include "crypto/secure_hash.h"
273--- a/chrome/browser/enterprise/connectors/connectors_manager.cc 282--- chrome/browser/enterprise/connectors/connectors_manager.cc.orig
274+++ b/chrome/browser/enterprise/connectors/connectors_manager.cc 283+++ chrome/browser/enterprise/connectors/connectors_manager.cc
275@@ -6,12 +6,12 @@ 284@@ -6,6 +6,7 @@
276 285
277 #include <memory> 286 #include <memory>
278 287
279+#include "base/bind.h" 288+#include "base/bind.h"
280 #include "base/feature_list.h" 289 #include "base/feature_list.h"
290 #include "base/no_destructor.h"
281 #include "base/values.h" 291 #include "base/values.h"
282 #include "chrome/browser/browser_process.h" 292@@ -13,7 +14,6 @@
283 #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"
284 #include "components/prefs/pref_service.h" 295 #include "components/prefs/pref_service.h"
285-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 296-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
286 #include "components/url_matcher/url_matcher.h" 297 #include "components/url_matcher/url_matcher.h"
287 #include "url/gurl.h" 298 #include "url/gurl.h"
288 299
289--- a/chrome/browser/enterprise/connectors/connectors_service.cc 300--- chrome/browser/enterprise/connectors/connectors_service.cc.orig
290+++ b/chrome/browser/enterprise/connectors/connectors_service.cc 301+++ chrome/browser/enterprise/connectors/connectors_service.cc
291@@ -37,7 +37,6 @@ 302@@ -36,7 +36,6 @@
292 #include "components/policy/core/common/cloud/machine_level_user_cloud_policy_store.h" 303 #include "components/policy/core/common/cloud/machine_level_user_cloud_policy_store.h"
293 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" 304 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
294 #include "components/policy/core/common/policy_types.h" 305 #include "components/policy/core/common/policy_types.h"
295-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 306-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
296 #include "components/signin/public/base/consent_level.h" 307 #include "components/signin/public/identity_manager/consent_level.h"
297 #include "components/signin/public/identity_manager/identity_manager.h" 308 #include "components/signin/public/identity_manager/identity_manager.h"
298 #include "components/user_prefs/user_prefs.h" 309 #include "components/user_prefs/user_prefs.h"
299@@ -390,8 +389,7 @@ std::string ConnectorsService::GetManage 310@@ -406,8 +405,7 @@ std::string ConnectorsService::GetManage
300 311
301 absl::optional<policy::PolicyScope> scope = absl::nullopt; 312 absl::optional<policy::PolicyScope> scope = absl::nullopt;
302 for (const char* scope_pref : 313 for (const char* scope_pref :
@@ -305,8 +316,8 @@
305+ {ConnectorScopePref(AnalysisConnector::FILE_ATTACHED), 316+ {ConnectorScopePref(AnalysisConnector::FILE_ATTACHED),
306 ConnectorScopePref(AnalysisConnector::FILE_DOWNLOADED), 317 ConnectorScopePref(AnalysisConnector::FILE_DOWNLOADED),
307 ConnectorScopePref(AnalysisConnector::BULK_DATA_ENTRY), 318 ConnectorScopePref(AnalysisConnector::BULK_DATA_ENTRY),
308 ConnectorScopePref(AnalysisConnector::PRINT), 319 ConnectorScopePref(ReportingConnector::SECURITY_EVENT)}) {
309@@ -443,20 +441,6 @@ std::string ConnectorsService::GetManage 320@@ -458,20 +456,6 @@ std::string ConnectorsService::GetManage
310 321
311 absl::optional<std::string> ConnectorsService::GetDMTokenForRealTimeUrlCheck() 322 absl::optional<std::string> ConnectorsService::GetDMTokenForRealTimeUrlCheck()
312 const { 323 const {
@@ -327,9 +338,9 @@
327 return absl::nullopt; 338 return absl::nullopt;
328 } 339 }
329 340
330--- a/chrome/browser/enterprise/connectors/connectors_service.h 341--- chrome/browser/enterprise/connectors/connectors_service.h.orig
331+++ b/chrome/browser/enterprise/connectors/connectors_service.h 342+++ chrome/browser/enterprise/connectors/connectors_service.h
332@@ -15,7 +15,6 @@ 343@@ -13,7 +13,6 @@
333 #include "components/keyed_service/content/browser_context_keyed_service_factory.h" 344 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
334 #include "components/keyed_service/core/keyed_service.h" 345 #include "components/keyed_service/core/keyed_service.h"
335 #include "components/policy/core/common/policy_types.h" 346 #include "components/policy/core/common/policy_types.h"
@@ -337,9 +348,9 @@
337 #include "content/public/browser/browser_context.h" 348 #include "content/public/browser/browser_context.h"
338 349
339 namespace base { 350 namespace base {
340--- a/chrome/browser/enterprise/signals/context_info_fetcher.cc 351--- chrome/browser/enterprise/signals/context_info_fetcher.cc.orig
341+++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc 352+++ chrome/browser/enterprise/signals/context_info_fetcher.cc
342@@ -218,11 +218,6 @@ void ContextInfoFetcher::Fetch(ContextIn 353@@ -183,11 +183,6 @@ void ContextInfoFetcher::Fetch(ContextIn
343 info.third_party_blocking_enabled = 354 info.third_party_blocking_enabled =
344 utils::GetThirdPartyBlockingEnabled(g_browser_process->local_state()); 355 utils::GetThirdPartyBlockingEnabled(g_browser_process->local_state());
345 356
@@ -349,19 +360,19 @@
349- info.password_protection_warning_trigger = 360- info.password_protection_warning_trigger =
350- utils::GetPasswordProtectionWarningTrigger(profile->GetPrefs()); 361- utils::GetPasswordProtectionWarningTrigger(profile->GetPrefs());
351 362
352 #if BUILDFLAG(IS_WIN) 363 #if defined(OS_WIN)
353 base::ThreadPool::CreateCOMSTATaskRunner({base::MayBlock()}) 364 base::ThreadPool::CreateCOMSTATaskRunner({base::MayBlock()})
354--- a/chrome/browser/enterprise/signals/context_info_fetcher.h 365--- chrome/browser/enterprise/signals/context_info_fetcher.h.orig
355+++ b/chrome/browser/enterprise/signals/context_info_fetcher.h 366+++ chrome/browser/enterprise/signals/context_info_fetcher.h
356@@ -13,7 +13,6 @@ 367@@ -12,7 +12,6 @@
357 #include "base/memory/raw_ptr.h" 368 #include "base/callback_forward.h"
358 #include "build/build_config.h" 369 #include "build/build_config.h"
359 #include "chrome/browser/enterprise/signals/signals_common.h" 370 #include "chrome/browser/enterprise/signals/signals_common.h"
360-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 371-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
361 372
362 namespace content { 373 namespace content {
363 class BrowserContext; 374 class BrowserContext;
364@@ -40,11 +39,8 @@ struct ContextInfo { 375@@ -39,11 +38,8 @@ struct ContextInfo {
365 std::vector<std::string> on_bulk_data_entry_providers; 376 std::vector<std::string> on_bulk_data_entry_providers;
366 std::vector<std::string> on_security_event_providers; 377 std::vector<std::string> on_security_event_providers;
367 std::string browser_version; 378 std::string browser_version;
@@ -373,18 +384,18 @@
373 absl::optional<bool> chrome_cleanup_enabled; 384 absl::optional<bool> chrome_cleanup_enabled;
374 bool chrome_remote_desktop_app_blocked; 385 bool chrome_remote_desktop_app_blocked;
375 absl::optional<bool> third_party_blocking_enabled; 386 absl::optional<bool> third_party_blocking_enabled;
376--- a/chrome/browser/enterprise/signals/signals_utils.cc 387--- chrome/browser/enterprise/signals/signals_utils.cc.orig
377+++ b/chrome/browser/enterprise/signals/signals_utils.cc 388+++ chrome/browser/enterprise/signals/signals_utils.cc
378@@ -10,7 +10,6 @@ 389@@ -10,7 +10,6 @@
379 #include "components/policy/content/policy_blocklist_service.h" 390 #include "components/policy/content/policy_blocklist_service.h"
380 #include "components/policy/core/browser/url_blocklist_manager.h" 391 #include "components/policy/core/browser/url_blocklist_manager.h"
381 #include "components/prefs/pref_service.h" 392 #include "components/prefs/pref_service.h"
382-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 393-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
383 394
384 #if BUILDFLAG(IS_WIN) 395 #if defined(OS_WIN)
385 #include "components/component_updater/pref_names.h" 396 #include "components/component_updater/pref_names.h"
386--- a/chrome/browser/enterprise/signals/signals_utils.h 397--- chrome/browser/enterprise/signals/signals_utils.h.orig
387+++ b/chrome/browser/enterprise/signals/signals_utils.h 398+++ chrome/browser/enterprise/signals/signals_utils.h
388@@ -5,8 +5,6 @@ 399@@ -5,8 +5,6 @@
389 #ifndef CHROME_BROWSER_ENTERPRISE_SIGNALS_SIGNALS_UTILS_H_ 400 #ifndef CHROME_BROWSER_ENTERPRISE_SIGNALS_SIGNALS_UTILS_H_
390 #define CHROME_BROWSER_ENTERPRISE_SIGNALS_SIGNALS_UTILS_H_ 401 #define CHROME_BROWSER_ENTERPRISE_SIGNALS_SIGNALS_UTILS_H_
@@ -394,8 +405,8 @@
394 #include "third_party/abseil-cpp/absl/types/optional.h" 405 #include "third_party/abseil-cpp/absl/types/optional.h"
395 406
396 class PolicyBlocklistService; 407 class PolicyBlocklistService;
397--- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc 408--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig
398+++ b/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
399@@ -77,45 +77,10 @@ api::enterprise_reporting_private::Conte 410@@ -77,45 +77,10 @@ api::enterprise_reporting_private::Conte
400 info.browser_version = std::move(signals.browser_version); 411 info.browser_version = std::move(signals.browser_version);
401 info.built_in_dns_client_enabled = signals.built_in_dns_client_enabled; 412 info.built_in_dns_client_enabled = signals.built_in_dns_client_enabled;
@@ -446,9 +457,9 @@
446 457
447 return info; 458 return info;
448 } 459 }
449--- a/chrome/browser/extensions/api/identity/identity_apitest.cc 460--- chrome/browser/extensions/api/identity/identity_apitest.cc.orig
450+++ b/chrome/browser/extensions/api/identity/identity_apitest.cc 461+++ chrome/browser/extensions/api/identity/identity_apitest.cc
451@@ -57,7 +57,6 @@ 462@@ -56,7 +56,6 @@
452 #include "components/prefs/pref_service.h" 463 #include "components/prefs/pref_service.h"
453 #include "components/signin/core/browser/account_reconcilor.h" 464 #include "components/signin/core/browser/account_reconcilor.h"
454 #include "components/signin/public/base/list_accounts_test_utils.h" 465 #include "components/signin/public/base/list_accounts_test_utils.h"
@@ -456,9 +467,9 @@
456 #include "components/signin/public/base/signin_switches.h" 467 #include "components/signin/public/base/signin_switches.h"
457 #include "components/signin/public/identity_manager/accounts_mutator.h" 468 #include "components/signin/public/identity_manager/accounts_mutator.h"
458 #include "components/signin/public/identity_manager/identity_manager.h" 469 #include "components/signin/public/identity_manager/identity_manager.h"
459--- a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc 470--- chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc.orig
460+++ b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc 471+++ chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
461@@ -29,7 +29,6 @@ 472@@ -30,7 +30,6 @@
462 #include "chrome/common/channel_info.h" 473 #include "chrome/common/channel_info.h"
463 #include "chrome/common/extensions/api/identity.h" 474 #include "chrome/common/extensions/api/identity.h"
464 #include "components/prefs/pref_service.h" 475 #include "components/prefs/pref_service.h"
@@ -466,7 +477,7 @@
466 #include "components/signin/public/base/signin_switches.h" 477 #include "components/signin/public/base/signin_switches.h"
467 #include "components/signin/public/identity_manager/access_token_info.h" 478 #include "components/signin/public/identity_manager/access_token_info.h"
468 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" 479 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
469@@ -63,7 +62,7 @@ const char* const kExtensionsIdentityAPI 480@@ -64,7 +63,7 @@ const char* const kExtensionsIdentityAPI
470 "extensions_identity_api"; 481 "extensions_identity_api";
471 482
472 bool IsBrowserSigninAllowed(Profile* profile) { 483 bool IsBrowserSigninAllowed(Profile* profile) {
@@ -475,8 +486,8 @@
475 } 486 }
476 487
477 std::string GetOAuth2MintTokenFlowVersion() { 488 std::string GetOAuth2MintTokenFlowVersion() {
478--- a/chrome/browser/extensions/api/preference/preference_api.cc 489--- chrome/browser/extensions/api/preference/preference_api.cc.orig
479+++ b/chrome/browser/extensions/api/preference/preference_api.cc 490+++ chrome/browser/extensions/api/preference/preference_api.cc
480@@ -35,7 +35,6 @@ 491@@ -35,7 +35,6 @@
481 #include "components/prefs/pref_service.h" 492 #include "components/prefs/pref_service.h"
482 #include "components/privacy_sandbox/privacy_sandbox_prefs.h" 493 #include "components/privacy_sandbox/privacy_sandbox_prefs.h"
@@ -484,8 +495,8 @@
484-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 495-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
485 #include "components/spellcheck/browser/pref_names.h" 496 #include "components/spellcheck/browser/pref_names.h"
486 #include "components/translate/core/browser/translate_pref_names.h" 497 #include "components/translate/core/browser/translate_pref_names.h"
487 #include "extensions/browser/api/content_settings/content_settings_service.h" 498 #include "extensions/browser/extension_pref_value_map.h"
488@@ -110,11 +109,6 @@ const PrefMappingEntry kPrefMapping[] = 499@@ -109,11 +108,6 @@ const PrefMappingEntry kPrefMapping[] =
489 APIPermissionID::kPrivacy}, 500 APIPermissionID::kPrivacy},
490 {"doNotTrackEnabled", prefs::kEnableDoNotTrack, APIPermissionID::kPrivacy, 501 {"doNotTrackEnabled", prefs::kEnableDoNotTrack, APIPermissionID::kPrivacy,
491 APIPermissionID::kPrivacy}, 502 APIPermissionID::kPrivacy},
@@ -497,7 +508,7 @@
497 {"searchSuggestEnabled", prefs::kSearchSuggestEnabled, 508 {"searchSuggestEnabled", prefs::kSearchSuggestEnabled,
498 APIPermissionID::kPrivacy, APIPermissionID::kPrivacy}, 509 APIPermissionID::kPrivacy, APIPermissionID::kPrivacy},
499 {"spellingServiceEnabled", spellcheck::prefs::kSpellCheckUseSpellingService, 510 {"spellingServiceEnabled", spellcheck::prefs::kSpellCheckUseSpellingService,
500@@ -845,18 +839,6 @@ ExtensionFunction::ResponseAction SetPre 511@@ -844,18 +838,6 @@ ExtensionFunction::ResponseAction SetPre
501 base::Value(browser_pref_value->GetBool())); 512 base::Value(browser_pref_value->GetBool()));
502 } 513 }
503 514
@@ -516,7 +527,7 @@
516 preference_api->SetExtensionControlledPref( 527 preference_api->SetExtensionControlledPref(
517 extension_id(), browser_pref, scope, 528 extension_id(), browser_pref, scope,
518 base::Value::FromUniquePtrValue(std::move(browser_pref_value))); 529 base::Value::FromUniquePtrValue(std::move(browser_pref_value)));
519@@ -909,18 +891,6 @@ ExtensionFunction::ResponseAction ClearP 530@@ -908,18 +890,6 @@ ExtensionFunction::ResponseAction ClearP
520 PreferenceAPI::Get(browser_context()) 531 PreferenceAPI::Get(browser_context())
521 ->RemoveExtensionControlledPref(extension_id(), browser_pref, scope); 532 ->RemoveExtensionControlledPref(extension_id(), browser_pref, scope);
522 533
@@ -535,9 +546,9 @@
535 return RespondNow(NoArguments()); 546 return RespondNow(NoArguments());
536 } 547 }
537 548
538--- a/chrome/browser/extensions/api/preference/preference_apitest.cc 549--- chrome/browser/extensions/api/preference/preference_apitest.cc.orig
539+++ b/chrome/browser/extensions/api/preference/preference_apitest.cc 550+++ chrome/browser/extensions/api/preference/preference_apitest.cc
540@@ -31,7 +31,6 @@ 551@@ -28,7 +28,6 @@
541 #include "components/keep_alive_registry/scoped_keep_alive.h" 552 #include "components/keep_alive_registry/scoped_keep_alive.h"
542 #include "components/password_manager/core/common/password_manager_pref_names.h" 553 #include "components/password_manager/core/common/password_manager_pref_names.h"
543 #include "components/prefs/pref_service.h" 554 #include "components/prefs/pref_service.h"
@@ -545,43 +556,43 @@
545 #include "components/translate/core/browser/translate_pref_names.h" 556 #include "components/translate/core/browser/translate_pref_names.h"
546 #include "content/public/browser/notification_service.h" 557 #include "content/public/browser/notification_service.h"
547 #include "content/public/test/browser_test.h" 558 #include "content/public/test/browser_test.h"
548@@ -86,7 +85,6 @@ class ExtensionPreferenceApiTest 559@@ -73,7 +72,6 @@ class ExtensionPreferenceApiTest : publi
549 prefs->GetInteger(prefetch::prefs::kNetworkPredictionOptions)); 560 prefs->GetInteger(prefs::kNetworkPredictionOptions));
550 EXPECT_TRUE( 561 EXPECT_TRUE(
551 prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService)); 562 prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService));
552- EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled)); 563- EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
553 EXPECT_TRUE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); 564 EXPECT_TRUE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
554 } 565 }
555 566
556@@ -112,7 +110,6 @@ class ExtensionPreferenceApiTest 567@@ -99,7 +97,6 @@ class ExtensionPreferenceApiTest : publi
557 prefs->GetInteger(prefetch::prefs::kNetworkPredictionOptions)); 568 prefs->GetInteger(prefs::kNetworkPredictionOptions));
558 EXPECT_FALSE( 569 EXPECT_FALSE(
559 prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService)); 570 prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService));
560- EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled)); 571- EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
561 EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); 572 EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
562 } 573 }
563 574
564@@ -185,7 +182,6 @@ IN_PROC_BROWSER_TEST_P(ExtensionPreferen 575@@ -163,7 +160,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionPreferen
565 prefetch::prefs::kNetworkPredictionOptions, 576 prefs->SetInteger(prefs::kNetworkPredictionOptions,
566 static_cast<int>(prefetch::NetworkPredictionOptions::kDisabled)); 577 chrome_browser_net::NETWORK_PREDICTION_NEVER);
567 prefs->SetBoolean(password_manager::prefs::kCredentialsEnableService, false); 578 prefs->SetBoolean(password_manager::prefs::kCredentialsEnableService, false);
568- prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false); 579- prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false);
569 prefs->SetBoolean(prefs::kSearchSuggestEnabled, false); 580 prefs->SetBoolean(prefs::kSearchSuggestEnabled, false);
570 prefs->SetString(prefs::kWebRTCIPHandlingPolicy, 581 prefs->SetString(prefs::kWebRTCIPHandlingPolicy,
571 blink::kWebRTCIPHandlingDefaultPublicInterfaceOnly); 582 blink::kWebRTCIPHandlingDefaultPublicInterfaceOnly);
572--- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc 583--- chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc.orig
573+++ b/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
574@@ -37,7 +37,6 @@ 585@@ -36,7 +36,6 @@
575 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" 586 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
576 #include "components/prefs/pref_service.h" 587 #include "components/prefs/pref_service.h"
577 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" 588 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
578-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 589-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
579 #include "components/signin/public/identity_manager/identity_manager.h" 590 #include "components/signin/public/identity_manager/identity_manager.h"
580 #include "components/url_matcher/url_matcher.h" 591 #include "content/public/browser/browser_context.h"
581 #include "components/url_matcher/url_util.h" 592 #include "extensions/browser/event_router.h"
582--- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc 593--- chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc.orig
583+++ b/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
584@@ -36,7 +36,6 @@ 595@@ -35,7 +35,6 @@
585 #include "components/policy/core/common/cloud/mock_cloud_policy_client.h" 596 #include "components/policy/core/common/cloud/mock_cloud_policy_client.h"
586 #include "components/policy/core/common/cloud/realtime_reporting_job_configuration.h" 597 #include "components/policy/core/common/cloud/realtime_reporting_job_configuration.h"
587 #include "components/safe_browsing/core/common/features.h" 598 #include "components/safe_browsing/core/common/features.h"
@@ -589,8 +600,8 @@
589 #include "components/signin/public/identity_manager/identity_test_environment.h" 600 #include "components/signin/public/identity_manager/identity_test_environment.h"
590 #include "content/public/test/browser_task_environment.h" 601 #include "content/public/test/browser_task_environment.h"
591 #include "extensions/browser/test_event_router.h" 602 #include "extensions/browser/test_event_router.h"
592--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc 603--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig
593+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc 604+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
594@@ -43,7 +43,6 @@ 605@@ -43,7 +43,6 @@
595 #include "components/prefs/pref_service.h" 606 #include "components/prefs/pref_service.h"
596 #include "components/privacy_sandbox/privacy_sandbox_prefs.h" 607 #include "components/privacy_sandbox/privacy_sandbox_prefs.h"
@@ -599,7 +610,7 @@
599 #include "components/search_engines/default_search_manager.h" 610 #include "components/search_engines/default_search_manager.h"
600 #include "components/spellcheck/browser/pref_names.h" 611 #include "components/spellcheck/browser/pref_names.h"
601 #include "components/translate/core/browser/translate_pref_names.h" 612 #include "components/translate/core/browser/translate_pref_names.h"
602@@ -292,16 +291,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil 613@@ -283,16 +282,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
603 settings_api::PrefType::PREF_TYPE_BOOLEAN; 614 settings_api::PrefType::PREF_TYPE_BOOLEAN;
604 615
605 // Security page 616 // Security page
@@ -616,9 +627,9 @@
616 (*s_allowlist)[::prefs::kHttpsOnlyModeEnabled] = 627 (*s_allowlist)[::prefs::kHttpsOnlyModeEnabled] =
617 settings_api::PrefType::PREF_TYPE_BOOLEAN; 628 settings_api::PrefType::PREF_TYPE_BOOLEAN;
618 629
619--- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc 630--- chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc.orig
620+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc 631+++ chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
621@@ -646,9 +646,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore 632@@ -647,9 +647,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore
622 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateGetReferrerChainApiTest, 633 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateGetReferrerChainApiTest,
623 GetReferrerChainForNonSafeBrowsingUser) { 634 GetReferrerChainForNonSafeBrowsingUser) {
624 PrefService* pref_service = browser()->profile()->GetPrefs(); 635 PrefService* pref_service = browser()->profile()->GetPrefs();
@@ -628,8 +639,8 @@
628 639
629 GURL page_url = GetTestServerURLWithReferrers("empty_referrer_chain.html"); 640 GURL page_url = GetTestServerURLWithReferrers("empty_referrer_chain.html");
630 ASSERT_TRUE(OpenTestURL(page_url)); 641 ASSERT_TRUE(OpenTestURL(page_url));
631--- a/chrome/browser/extensions/extension_allowlist.cc 642--- chrome/browser/extensions/extension_allowlist.cc.orig
632+++ b/chrome/browser/extensions/extension_allowlist.cc 643+++ chrome/browser/extensions/extension_allowlist.cc
633@@ -9,7 +9,6 @@ 644@@ -9,7 +9,6 @@
634 #include "chrome/browser/profiles/profile.h" 645 #include "chrome/browser/profiles/profile.h"
635 #include "chrome/browser/safe_browsing/safe_browsing_metrics_collector_factory.h" 646 #include "chrome/browser/safe_browsing/safe_browsing_metrics_collector_factory.h"
@@ -681,8 +692,8 @@
681 } 692 }
682 693
683 } // namespace extensions 694 } // namespace extensions
684--- a/chrome/browser/extensions/installed_loader.cc 695--- chrome/browser/extensions/installed_loader.cc.orig
685+++ b/chrome/browser/extensions/installed_loader.cc 696+++ chrome/browser/extensions/installed_loader.cc
686@@ -797,12 +797,6 @@ void InstalledLoader::RecordExtensionsMe 697@@ -797,12 +797,6 @@ void InstalledLoader::RecordExtensionsMe
687 enabled_not_allowlisted_count); 698 enabled_not_allowlisted_count);
688 base::UmaHistogramCounts100("Extensions.NotAllowlistedDisabled", 699 base::UmaHistogramCounts100("Extensions.NotAllowlistedDisabled",
@@ -696,9 +707,9 @@
696 } 707 }
697 708
698 int InstalledLoader::GetCreationFlags(const ExtensionInfo* info) { 709 int InstalledLoader::GetCreationFlags(const ExtensionInfo* info) {
699--- a/chrome/browser/net/profile_network_context_service.cc 710--- chrome/browser/net/profile_network_context_service.cc.orig
700+++ b/chrome/browser/net/profile_network_context_service.cc 711+++ chrome/browser/net/profile_network_context_service.cc
701@@ -47,7 +47,6 @@ 712@@ -43,7 +43,6 @@
702 #include "components/pref_registry/pref_registry_syncable.h" 713 #include "components/pref_registry/pref_registry_syncable.h"
703 #include "components/prefs/pref_registry_simple.h" 714 #include "components/prefs/pref_registry_simple.h"
704 #include "components/prefs/pref_service.h" 715 #include "components/prefs/pref_service.h"
@@ -706,24 +717,22 @@
706 #include "content/public/browser/browser_context.h" 717 #include "content/public/browser/browser_context.h"
707 #include "content/public/browser/browser_thread.h" 718 #include "content/public/browser/browser_thread.h"
708 #include "content/public/browser/network_service_instance.h" 719 #include "content/public/browser/network_service_instance.h"
709@@ -800,15 +799,8 @@ void ProfileNetworkContextService::Confi 720@@ -741,13 +740,6 @@ void ProfileNetworkContextService::Confi
710 network_context_params->enable_certificate_reporting = true; 721 network_context_params->enable_certificate_reporting = true;
711 network_context_params->enable_expect_ct_reporting = true; 722 network_context_params->enable_expect_ct_reporting = true;
712 723
713- SCTReportingService* sct_reporting_service = 724- // Initialize the network context to do SCT auditing only if the current
714- SCTReportingServiceFactory::GetForBrowserContext(profile_); 725- // profile is opted in to Safe Browsing Extended Reporting.
715- if (sct_reporting_service) { 726- if (!profile_->IsOffTheRecord() &&
716- network_context_params->sct_auditing_mode = 727- safe_browsing::IsExtendedReportingEnabled(*profile_->GetPrefs())) {
717- sct_reporting_service->GetReportingMode(); 728- network_context_params->enable_sct_auditing = true;
718- } else {
719 network_context_params->sct_auditing_mode =
720 network::mojom::SCTAuditingMode::kDisabled;
721- } 729- }
722 730-
723 network_context_params->ct_policy = GetCTPolicy(); 731 network_context_params->ct_policy = GetCTPolicy();
724 732
725--- a/chrome/browser/net/trial_comparison_cert_verifier_browsertest.cc 733 #if BUILDFLAG(TRIAL_COMPARISON_CERT_VERIFIER_SUPPORTED)
726+++ b/chrome/browser/net/trial_comparison_cert_verifier_browsertest.cc 734--- chrome/browser/net/trial_comparison_cert_verifier_browsertest.cc.orig
735+++ chrome/browser/net/trial_comparison_cert_verifier_browsertest.cc
727@@ -11,7 +11,6 @@ 736@@ -11,7 +11,6 @@
728 #include "chrome/test/base/in_process_browser_test.h" 737 #include "chrome/test/base/in_process_browser_test.h"
729 #include "chrome/test/base/ui_test_utils.h" 738 #include "chrome/test/base/ui_test_utils.h"
@@ -732,8 +741,8 @@
732 #include "content/public/test/browser_test.h" 741 #include "content/public/test/browser_test.h"
733 #include "net/base/features.h" 742 #include "net/base/features.h"
734 #include "net/cert/trial_comparison_cert_verifier.h" 743 #include "net/cert/trial_comparison_cert_verifier.h"
735--- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc 744--- chrome/browser/net/trial_comparison_cert_verifier_controller.cc.orig
736+++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc 745+++ chrome/browser/net/trial_comparison_cert_verifier_controller.cc
737@@ -19,7 +19,6 @@ 746@@ -19,7 +19,6 @@
738 #include "chrome/browser/safe_browsing/certificate_reporting_service.h" 747 #include "chrome/browser/safe_browsing/certificate_reporting_service.h"
739 #include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h" 748 #include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h"
@@ -766,8 +775,8 @@
766 } 775 }
767 776
768 void TrialComparisonCertVerifierController::SendTrialReport( 777 void TrialComparisonCertVerifierController::SendTrialReport(
769--- a/chrome/browser/net/trial_comparison_cert_verifier_controller.h 778--- chrome/browser/net/trial_comparison_cert_verifier_controller.h.orig
770+++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.h 779+++ chrome/browser/net/trial_comparison_cert_verifier_controller.h
771@@ -14,7 +14,6 @@ 780@@ -14,7 +14,6 @@
772 #include "base/memory/ref_counted.h" 781 #include "base/memory/ref_counted.h"
773 #include "base/memory/weak_ptr.h" 782 #include "base/memory/weak_ptr.h"
@@ -779,14 +788,14 @@
779@@ -77,7 +76,6 @@ class TrialComparisonCertVerifierControl 788@@ -77,7 +76,6 @@ class TrialComparisonCertVerifierControl
780 void RefreshState(); 789 void RefreshState();
781 790
782 raw_ptr<Profile> profile_; 791 Profile* profile_;
783- PrefChangeRegistrar pref_change_registrar_; 792- PrefChangeRegistrar pref_change_registrar_;
784 793
785 mojo::ReceiverSet< 794 mojo::ReceiverSet<
786 cert_verifier::mojom::TrialComparisonCertVerifierReportClient> 795 cert_verifier::mojom::TrialComparisonCertVerifierReportClient>
787--- a/chrome/browser/net/trial_comparison_cert_verifier_controller_unittest.cc 796--- chrome/browser/net/trial_comparison_cert_verifier_controller_unittest.cc.orig
788+++ b/chrome/browser/net/trial_comparison_cert_verifier_controller_unittest.cc 797+++ chrome/browser/net/trial_comparison_cert_verifier_controller_unittest.cc
789@@ -21,7 +21,6 @@ 798@@ -20,7 +20,6 @@
790 #include "chrome/test/base/testing_browser_process.h" 799 #include "chrome/test/base/testing_browser_process.h"
791 #include "chrome/test/base/testing_profile.h" 800 #include "chrome/test/base/testing_profile.h"
792 #include "chrome/test/base/testing_profile_manager.h" 801 #include "chrome/test/base/testing_profile_manager.h"
@@ -794,17 +803,17 @@
794 #include "components/security_interstitials/content/cert_logger.pb.h" 803 #include "components/security_interstitials/content/cert_logger.pb.h"
795 #include "components/sync_preferences/testing_pref_service_syncable.h" 804 #include "components/sync_preferences/testing_pref_service_syncable.h"
796 #include "content/public/browser/browser_task_traits.h" 805 #include "content/public/browser/browser_task_traits.h"
797--- a/chrome/browser/password_manager/generated_password_leak_detection_pref.cc 806--- chrome/browser/password_manager/generated_password_leak_detection_pref.cc.orig
798+++ b/chrome/browser/password_manager/generated_password_leak_detection_pref.cc 807+++ chrome/browser/password_manager/generated_password_leak_detection_pref.cc
799@@ -14,7 +14,6 @@ 808@@ -13,7 +13,6 @@
800 #include "components/password_manager/core/common/password_manager_features.h" 809 #include "chrome/common/extensions/api/settings_private.h"
801 #include "components/password_manager/core/common/password_manager_pref_names.h" 810 #include "components/password_manager/core/common/password_manager_pref_names.h"
802 #include "components/prefs/pref_service.h" 811 #include "components/prefs/pref_service.h"
803-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 812-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
804 #include "components/signin/public/identity_manager/identity_manager.h" 813 #include "components/signin/public/identity_manager/identity_manager.h"
805 814
806 namespace { 815 namespace {
807@@ -37,8 +36,7 @@ bool IsUserAllowedToUseLeakDetection(Pro 816@@ -43,8 +42,7 @@ bool IsUserSignedInAndSyncing(Profile* p
808 // Returns whether the effective value of the Safe Browsing preferences for 817 // Returns whether the effective value of the Safe Browsing preferences for
809 // |profile| is standard protection. 818 // |profile| is standard protection.
810 bool IsSafeBrowsingStandard(Profile* profile) { 819 bool IsSafeBrowsingStandard(Profile* profile) {
@@ -814,7 +823,7 @@
814 } 823 }
815 824
816 } // namespace 825 } // namespace
817@@ -57,16 +55,6 @@ GeneratedPasswordLeakDetectionPref::Gene 826@@ -63,16 +61,6 @@ GeneratedPasswordLeakDetectionPref::Gene
818 base::BindRepeating( 827 base::BindRepeating(
819 &GeneratedPasswordLeakDetectionPref::OnSourcePreferencesChanged, 828 &GeneratedPasswordLeakDetectionPref::OnSourcePreferencesChanged,
820 base::Unretained(this))); 829 base::Unretained(this)));
@@ -831,8 +840,8 @@
831 840
832 if (auto* identity_manager = IdentityManagerFactory::GetForProfile(profile)) 841 if (auto* identity_manager = IdentityManagerFactory::GetForProfile(profile))
833 identity_manager_observer_.Observe(identity_manager); 842 identity_manager_observer_.Observe(identity_manager);
834--- a/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc 843--- chrome/browser/permissions/abusive_origin_permission_revocation_request.cc.orig
835+++ b/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc 844+++ chrome/browser/permissions/abusive_origin_permission_revocation_request.cc
836@@ -17,7 +17,6 @@ 845@@ -17,7 +17,6 @@
837 #include "components/permissions/permissions_client.h" 846 #include "components/permissions/permissions_client.h"
838 #include "components/prefs/pref_service.h" 847 #include "components/prefs/pref_service.h"
@@ -841,18 +850,18 @@
841 850
842 namespace { 851 namespace {
843 constexpr char kExcludedKey[] = "exempted"; 852 constexpr char kExcludedKey[] = "exempted";
844--- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc 853--- chrome/browser/permissions/prediction_based_permission_ui_selector.cc.orig
845+++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc 854+++ chrome/browser/permissions/prediction_based_permission_ui_selector.cc
846@@ -26,7 +26,6 @@ 855@@ -23,7 +23,6 @@
847 #include "components/permissions/prediction_service/prediction_service.h" 856 #include "components/permissions/prediction_service/prediction_service.h"
848 #include "components/permissions/prediction_service/prediction_service_messages.pb.h" 857 #include "components/permissions/prediction_service/prediction_service_messages.pb.h"
849 #include "components/prefs/pref_service.h" 858 #include "components/prefs/pref_service.h"
850-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 859-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
851 860
852 #if BUILDFLAG(BUILD_WITH_TFLITE_LIB) 861 namespace {
853 #include "chrome/browser/permissions/prediction_model_handler_factory.h" 862
854--- a/chrome/browser/policy/browser_signin_policy_handler.cc 863--- chrome/browser/policy/browser_signin_policy_handler.cc.orig
855+++ b/chrome/browser/policy/browser_signin_policy_handler.cc 864+++ chrome/browser/policy/browser_signin_policy_handler.cc
856@@ -15,7 +15,6 @@ 865@@ -15,7 +15,6 @@
857 #include "components/policy/core/common/policy_map.h" 866 #include "components/policy/core/common/policy_map.h"
858 #include "components/policy/policy_constants.h" 867 #include "components/policy/policy_constants.h"
@@ -863,11 +872,11 @@
863 BrowserSigninPolicyHandler::BrowserSigninPolicyHandler(Schema chrome_schema) 872 BrowserSigninPolicyHandler::BrowserSigninPolicyHandler(Schema chrome_schema)
864@@ -48,28 +47,18 @@ void BrowserSigninPolicyHandler::ApplyPo 873@@ -48,28 +47,18 @@ void BrowserSigninPolicyHandler::ApplyPo
865 #endif 874 #endif
866 [[fallthrough]]; 875 FALLTHROUGH;
867 case BrowserSigninMode::kEnabled: 876 case BrowserSigninMode::kEnabled:
868+#if !BUILDFLAG(IS_ANDROID) 877+#if !defined(OS_ANDROID)
869 prefs->SetValue( 878 prefs->SetValue(
870-#if BUILDFLAG(IS_ANDROID) 879-#if defined(OS_ANDROID)
871- // The new kSigninAllowedOnNextStartup pref is only used on Desktop. 880- // The new kSigninAllowedOnNextStartup pref is only used on Desktop.
872- // Keep the old kSigninAllowed pref for Android until the policy is 881- // Keep the old kSigninAllowed pref for Android until the policy is
873- // fully deprecated in M71 and can be removed. 882- // fully deprecated in M71 and can be removed.
@@ -879,9 +888,9 @@
879+#endif 888+#endif
880 break; 889 break;
881 case BrowserSigninMode::kDisabled: 890 case BrowserSigninMode::kDisabled:
882+#if !BUILDFLAG(IS_ANDROID) 891+#if !defined(OS_ANDROID)
883 prefs->SetValue( 892 prefs->SetValue(
884-#if BUILDFLAG(IS_ANDROID) 893-#if defined(OS_ANDROID)
885- // The new kSigninAllowedOnNextStartup pref is only used on Desktop. 894- // The new kSigninAllowedOnNextStartup pref is only used on Desktop.
886- // Keep the old kSigninAllowed pref for Android until the policy is 895- // Keep the old kSigninAllowed pref for Android until the policy is
887- // fully deprecated in M71 and can be removed. 896- // fully deprecated in M71 and can be removed.
@@ -894,12 +903,12 @@
894 break; 903 break;
895 } 904 }
896 } 905 }
897--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc 906--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig
898+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc 907+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
899@@ -94,12 +94,9 @@ 908@@ -83,12 +83,9 @@
909 #include "components/policy/core/common/schema.h"
910 #include "components/policy/policy_constants.h"
900 #include "components/proxy_config/proxy_policy_handler.h" 911 #include "components/proxy_config/proxy_policy_handler.h"
901 #include "components/safe_browsing/buildflags.h"
902 #include "components/safe_browsing/content/common/file_type_policies_prefs.h"
903-#include "components/safe_browsing/core/common/safe_browsing_policy_handler.h" 912-#include "components/safe_browsing/core/common/safe_browsing_policy_handler.h"
904-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 913-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
905 #include "components/search_engines/default_search_policy_handler.h" 914 #include "components/search_engines/default_search_policy_handler.h"
@@ -909,7 +918,7 @@
909 #include "components/spellcheck/spellcheck_buildflags.h" 918 #include "components/spellcheck/spellcheck_buildflags.h"
910 #include "components/sync/base/pref_names.h" 919 #include "components/sync/base/pref_names.h"
911 #include "components/sync/driver/sync_policy_handler.h" 920 #include "components/sync/driver/sync_policy_handler.h"
912@@ -222,15 +219,6 @@ const PolicyToPreferenceMapEntry kSimple 921@@ -209,15 +206,6 @@ const PolicyToPreferenceMapEntry kSimple
913 { key::kQuicAllowed, 922 { key::kQuicAllowed,
914 prefs::kQuicAllowed, 923 prefs::kQuicAllowed,
915 base::Value::Type::BOOLEAN }, 924 base::Value::Type::BOOLEAN },
@@ -925,7 +934,7 @@
925 { key::kUrlKeyedAnonymizedDataCollectionEnabled, 934 { key::kUrlKeyedAnonymizedDataCollectionEnabled,
926 unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled, 935 unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled,
927 base::Value::Type::BOOLEAN }, 936 base::Value::Type::BOOLEAN },
928@@ -366,15 +354,6 @@ const PolicyToPreferenceMapEntry kSimple 937@@ -353,15 +341,6 @@ const PolicyToPreferenceMapEntry kSimple
929 { key::kGloballyScopeHTTPAuthCacheEnabled, 938 { key::kGloballyScopeHTTPAuthCacheEnabled,
930 prefs::kGloballyScopeHTTPAuthCacheEnabled, 939 prefs::kGloballyScopeHTTPAuthCacheEnabled,
931 base::Value::Type::BOOLEAN }, 940 base::Value::Type::BOOLEAN },
@@ -941,7 +950,7 @@
941 { key::kSafeSitesFilterBehavior, 950 { key::kSafeSitesFilterBehavior,
942 policy_prefs::kSafeSitesFilterBehavior, 951 policy_prefs::kSafeSitesFilterBehavior,
943 base::Value::Type::INTEGER }, 952 base::Value::Type::INTEGER },
944@@ -483,18 +462,12 @@ const PolicyToPreferenceMapEntry kSimple 953@@ -470,18 +449,12 @@ const PolicyToPreferenceMapEntry kSimple
945 { key::kMaxConnectionsPerProxy, 954 { key::kMaxConnectionsPerProxy,
946 prefs::kMaxConnectionsPerProxy, 955 prefs::kMaxConnectionsPerProxy,
947 base::Value::Type::INTEGER }, 956 base::Value::Type::INTEGER },
@@ -960,7 +969,7 @@
960 { key::kCECPQ2Enabled, 969 { key::kCECPQ2Enabled,
961 prefs::kCECPQ2Enabled, 970 prefs::kCECPQ2Enabled,
962 base::Value::Type::BOOLEAN }, 971 base::Value::Type::BOOLEAN },
963@@ -706,9 +679,6 @@ const PolicyToPreferenceMapEntry kSimple 972@@ -684,9 +657,6 @@ const PolicyToPreferenceMapEntry kSimple
964 { key::kIntranetRedirectBehavior, 973 { key::kIntranetRedirectBehavior,
965 omnibox::kIntranetRedirectBehavior, 974 omnibox::kIntranetRedirectBehavior,
966 base::Value::Type::INTEGER }, 975 base::Value::Type::INTEGER },
@@ -970,16 +979,16 @@
970 { key::kAccessibilityImageLabelsEnabled, 979 { key::kAccessibilityImageLabelsEnabled,
971 prefs::kAccessibilityImageLabelsEnabled, 980 prefs::kAccessibilityImageLabelsEnabled,
972 base::Value::Type::BOOLEAN }, 981 base::Value::Type::BOOLEAN },
973@@ -1740,8 +1710,6 @@ std::unique_ptr<ConfigurationPolicyHandl 982@@ -1642,8 +1612,6 @@ std::unique_ptr<ConfigurationPolicyHandl
974 handlers->AddHandler(std::make_unique<JavascriptPolicyHandler>()); 983 handlers->AddHandler(std::make_unique<JavascriptPolicyHandler>());
975 handlers->AddHandler(std::make_unique<NetworkPredictionPolicyHandler>()); 984 handlers->AddHandler(std::make_unique<NetworkPredictionPolicyHandler>());
976 handlers->AddHandler(std::make_unique<RestoreOnStartupPolicyHandler>()); 985 handlers->AddHandler(std::make_unique<RestoreOnStartupPolicyHandler>());
977- handlers->AddHandler( 986- handlers->AddHandler(
978- std::make_unique<safe_browsing::SafeBrowsingPolicyHandler>()); 987- std::make_unique<safe_browsing::SafeBrowsingPolicyHandler>());
979 handlers->AddHandler(std::make_unique<SimpleDeprecatingPolicyHandler>( 988 handlers->AddHandler(std::make_unique<SimpleDeprecatingPolicyHandler>(
980 std::make_unique<SimplePolicyHandler>( 989 std::make_unique<SimplePolicyHandler>(key::kAuthServerWhitelist,
981 key::kAuthServerWhitelist, // nocheck 990 prefs::kAuthServerAllowlist,
982@@ -1765,9 +1733,6 @@ std::unique_ptr<ConfigurationPolicyHandl 991@@ -1667,9 +1635,6 @@ std::unique_ptr<ConfigurationPolicyHandl
983 key::kWindowOcclusionEnabled, 992 key::kWindowOcclusionEnabled,
984 policy::policy_prefs::kNativeWindowOcclusionEnabled, 993 policy::policy_prefs::kNativeWindowOcclusionEnabled,
985 base::Value::Type::BOOLEAN))); 994 base::Value::Type::BOOLEAN)));
@@ -989,7 +998,7 @@
989 handlers->AddHandler(std::make_unique<syncer::SyncPolicyHandler>()); 998 handlers->AddHandler(std::make_unique<syncer::SyncPolicyHandler>());
990 handlers->AddHandler(std::make_unique<BrowsingHistoryPolicyHandler>()); 999 handlers->AddHandler(std::make_unique<BrowsingHistoryPolicyHandler>());
991 1000
992@@ -1863,12 +1828,6 @@ std::unique_ptr<ConfigurationPolicyHandl 1001@@ -1762,12 +1727,6 @@ std::unique_ptr<ConfigurationPolicyHandl
993 key::kOnSecurityEventEnterpriseConnector, 1002 key::kOnSecurityEventEnterpriseConnector,
994 enterprise_connectors::kOnSecurityEventPref, 1003 enterprise_connectors::kOnSecurityEventPref,
995 enterprise_connectors::kOnSecurityEventScopePref, chrome_schema)); 1004 enterprise_connectors::kOnSecurityEventScopePref, chrome_schema));
@@ -1002,54 +1011,53 @@
1002 1011
1003 handlers->AddHandler(std::make_unique<BrowsingDataLifetimePolicyHandler>( 1012 handlers->AddHandler(std::make_unique<BrowsingDataLifetimePolicyHandler>(
1004 key::kClearBrowsingDataOnExitList, 1013 key::kClearBrowsingDataOnExitList,
1005@@ -1918,17 +1877,6 @@ std::unique_ptr<ConfigurationPolicyHandl 1014@@ -1806,17 +1765,6 @@ std::unique_ptr<ConfigurationPolicyHandl
1006 signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>( 1015 signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
1007 key::kForceBrowserSignin, prefs::kForceBrowserSignin, 1016 key::kForceBrowserSignin, prefs::kForceBrowserSignin,
1008 base::Value::Type::BOOLEAN)); 1017 base::Value::Type::BOOLEAN));
1009- signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>( 1018- signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
1010- key::kSigninAllowed, 1019- key::kSigninAllowed,
1011-#if BUILDFLAG(IS_ANDROID) 1020-#if defined(OS_ANDROID)
1012- // The new kSigninAllowedOnNextStartup pref is only used on Desktop. 1021- // The new kSigninAllowedOnNextStartup pref is only used on Desktop.
1013- // Keep the old kSigninAllowed pref for Android until the policy is 1022- // Keep the old kSigninAllowed pref for Android until the policy is
1014- // fully deprecated in M71 and can be removed. 1023- // fully deprecated in M71 and can be removed.
1015- prefs::kSigninAllowed, 1024- prefs::kSigninAllowed,
1016-#else // BUILDFLAG(IS_ANDROID) 1025-#else // defined(OS_ANDROID)
1017- prefs::kSigninAllowedOnNextStartup, 1026- prefs::kSigninAllowedOnNextStartup,
1018-#endif // BUILDFLAG(IS_ANDROID) 1027-#endif // defined(OS_ANDROID)
1019- base::Value::Type::BOOLEAN)); 1028- base::Value::Type::BOOLEAN));
1020 handlers->AddHandler(std::make_unique<LegacyPoliciesDeprecatingPolicyHandler>( 1029 handlers->AddHandler(std::make_unique<LegacyPoliciesDeprecatingPolicyHandler>(
1021 std::move(signin_legacy_policies), 1030 std::move(signin_legacy_policies),
1022 std::make_unique<BrowserSigninPolicyHandler>(chrome_schema))); 1031 std::make_unique<BrowserSigninPolicyHandler>(chrome_schema)));
1023--- a/chrome/browser/prefs/browser_prefs.cc 1032--- chrome/browser/prefs/browser_prefs.cc.orig
1024+++ b/chrome/browser/prefs/browser_prefs.cc 1033+++ chrome/browser/prefs/browser_prefs.cc
1025@@ -132,7 +132,6 @@ 1034@@ -139,7 +139,6 @@
1035 #include "components/prefs/pref_service.h"
1026 #include "components/privacy_sandbox/privacy_sandbox_prefs.h" 1036 #include "components/privacy_sandbox/privacy_sandbox_prefs.h"
1027 #include "components/proxy_config/pref_proxy_config_tracker_impl.h" 1037 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
1028 #include "components/safe_browsing/content/common/file_type_policies_prefs.h"
1029-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 1038-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
1030 #include "components/search_engines/template_url_prepopulate_data.h" 1039 #include "components/search_engines/template_url_prepopulate_data.h"
1031 #include "components/security_interstitials/content/insecure_form_blocking_page.h" 1040 #include "components/security_interstitials/content/insecure_form_blocking_page.h"
1032 #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" 1041 #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
1033@@ -989,7 +988,6 @@ void RegisterLocalState(PrefRegistrySimp 1042@@ -921,7 +920,6 @@ void RegisterLocalState(PrefRegistrySimp
1034 ProfileNetworkContextService::RegisterLocalStatePrefs(registry); 1043 ProfileNetworkContextService::RegisterLocalStatePrefs(registry);
1035 profiles::RegisterPrefs(registry); 1044 profiles::RegisterPrefs(registry);
1036 RegisterScreenshotPrefs(registry); 1045 RegisterScreenshotPrefs(registry);
1037- safe_browsing::RegisterLocalStatePrefs(registry); 1046- safe_browsing::RegisterLocalStatePrefs(registry);
1038 secure_origin_allowlist::RegisterPrefs(registry); 1047 secure_origin_allowlist::RegisterPrefs(registry);
1039 #if !BUILDFLAG(IS_ANDROID) 1048 #if !defined(OS_ANDROID)
1040 SerialPolicyAllowedPorts::RegisterPrefs(registry); 1049 SerialPolicyAllowedPorts::RegisterPrefs(registry);
1041@@ -1246,8 +1244,6 @@ void RegisterProfilePrefs(user_prefs::Pr 1050@@ -1171,7 +1169,6 @@ void RegisterProfilePrefs(user_prefs::Pr
1042 PushMessagingAppIdentifier::RegisterProfilePrefs(registry); 1051 PushMessagingAppIdentifier::RegisterProfilePrefs(registry);
1043 QuietNotificationPermissionUiState::RegisterProfilePrefs(registry); 1052 QuietNotificationPermissionUiState::RegisterProfilePrefs(registry);
1044 RegisterBrowserUserPrefs(registry); 1053 RegisterBrowserUserPrefs(registry);
1045- safe_browsing::file_type::RegisterProfilePrefs(registry);
1046- safe_browsing::RegisterProfilePrefs(registry); 1054- safe_browsing::RegisterProfilePrefs(registry);
1047 SearchPrefetchService::RegisterProfilePrefs(registry); 1055 SearchPrefetchService::RegisterProfilePrefs(registry);
1048 blocked_content::SafeBrowsingTriggeredPopupBlocker::RegisterProfilePrefs( 1056 blocked_content::SafeBrowsingTriggeredPopupBlocker::RegisterProfilePrefs(
1049 registry); 1057 registry);
1050--- a/chrome/browser/prefs/chrome_command_line_pref_store.cc 1058--- chrome/browser/prefs/chrome_command_line_pref_store.cc.orig
1051+++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc 1059+++ chrome/browser/prefs/chrome_command_line_pref_store.cc
1052@@ -29,7 +29,6 @@ 1060@@ -31,7 +31,6 @@
1053 #include "components/language/core/browser/pref_names.h" 1061 #include "components/language/core/browser/pref_names.h"
1054 #include "components/proxy_config/proxy_config_dictionary.h" 1062 #include "components/proxy_config/proxy_config_dictionary.h"
1055 #include "components/proxy_config/proxy_config_pref_names.h" 1063 #include "components/proxy_config/proxy_config_pref_names.h"
@@ -1057,18 +1065,18 @@
1057 #include "components/safe_browsing/core/common/safebrowsing_switches.h" 1065 #include "components/safe_browsing/core/common/safebrowsing_switches.h"
1058 #include "components/sync/base/pref_names.h" 1066 #include "components/sync/base/pref_names.h"
1059 #include "content/public/common/content_switches.h" 1067 #include "content/public/common/content_switches.h"
1060@@ -77,8 +76,6 @@ const CommandLinePrefStore::BooleanSwitc 1068@@ -78,8 +77,6 @@ const CommandLinePrefStore::BooleanSwitc
1061 {switches::kAllowCrossOriginAuthPrompt, 1069 {switches::kAllowCrossOriginAuthPrompt,
1062 prefs::kAllowCrossOriginAuthPrompt, true}, 1070 prefs::kAllowCrossOriginAuthPrompt, true},
1063 {switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true}, 1071 {switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true},
1064- {safe_browsing::switches::kSbEnableEnhancedProtection, 1072- {safe_browsing::switches::kSbEnableEnhancedProtection,
1065- prefs::kSafeBrowsingEnhanced, true}, 1073- prefs::kSafeBrowsingEnhanced, true},
1066 #if BUILDFLAG(IS_CHROMEOS_ASH) 1074 #if BUILDFLAG(IS_CHROMEOS_ASH)
1067 {ash::switches::kEnableTouchpadThreeFingerClick, 1075 {chromeos::switches::kEnableTouchpadThreeFingerClick,
1068 prefs::kEnableTouchpadThreeFingerClick, true}, 1076 prefs::kEnableTouchpadThreeFingerClick, true},
1069--- a/chrome/browser/prefs/chrome_pref_service_factory.cc 1077--- chrome/browser/prefs/chrome_pref_service_factory.cc.orig
1070+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc 1078+++ chrome/browser/prefs/chrome_pref_service_factory.cc
1071@@ -50,10 +50,8 @@ 1079@@ -48,10 +48,8 @@
1072 #include "components/prefs/pref_service.h" 1080 #include "components/prefs/pref_service.h"
1073 #include "components/prefs/pref_store.h" 1081 #include "components/prefs/pref_store.h"
1074 #include "components/prefs/pref_value_store.h" 1082 #include "components/prefs/pref_value_store.h"
@@ -1079,7 +1087,7 @@
1079 #include "components/sync/base/model_type.h" 1087 #include "components/sync/base/model_type.h"
1080 #include "components/sync/base/pref_names.h" 1088 #include "components/sync/base/pref_names.h"
1081 #include "components/sync_preferences/pref_model_associator.h" 1089 #include "components/sync_preferences/pref_model_associator.h"
1082@@ -123,8 +121,6 @@ const prefs::TrackedPreferenceMetadata k 1090@@ -121,8 +119,6 @@ const prefs::TrackedPreferenceMetadata k
1083 {5, extensions::pref_names::kExtensions, EnforcementLevel::NO_ENFORCEMENT, 1091 {5, extensions::pref_names::kExtensions, EnforcementLevel::NO_ENFORCEMENT,
1084 PrefTrackingStrategy::SPLIT, ValueType::IMPERSONAL}, 1092 PrefTrackingStrategy::SPLIT, ValueType::IMPERSONAL},
1085 #endif 1093 #endif
@@ -1087,17 +1095,17 @@
1087- PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL}, 1095- PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL},
1088 {7, prefs::kSearchProviderOverrides, EnforcementLevel::ENFORCE_ON_LOAD, 1096 {7, prefs::kSearchProviderOverrides, EnforcementLevel::ENFORCE_ON_LOAD,
1089 PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, 1097 PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
1090 #if !BUILDFLAG(IS_ANDROID) 1098 #if !defined(OS_ANDROID)
1091@@ -148,8 +144,6 @@ const prefs::TrackedPreferenceMetadata k 1099@@ -146,8 +142,6 @@ const prefs::TrackedPreferenceMetadata k
1092 PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, 1100 PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
1093 // kSyncRemainingRollbackTries is deprecated and will be removed a few 1101 // kSyncRemainingRollbackTries is deprecated and will be removed a few
1094 // releases after M50. 1102 // releases after M50.
1095- {18, prefs::kSafeBrowsingIncidentsSent, EnforcementLevel::ENFORCE_ON_LOAD, 1103- {18, prefs::kSafeBrowsingIncidentsSent, EnforcementLevel::ENFORCE_ON_LOAD,
1096- PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, 1104- PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
1097 #if BUILDFLAG(IS_WIN) 1105 #if defined(OS_WIN)
1098 {19, prefs::kSwReporterPromptVersion, EnforcementLevel::ENFORCE_ON_LOAD, 1106 {19, prefs::kSwReporterPromptVersion, EnforcementLevel::ENFORCE_ON_LOAD,
1099 PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, 1107 PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
1100@@ -158,10 +152,6 @@ const prefs::TrackedPreferenceMetadata k 1108@@ -156,10 +150,6 @@ const prefs::TrackedPreferenceMetadata k
1101 {22, prefs::kSwReporterPromptSeed, EnforcementLevel::ENFORCE_ON_LOAD, 1109 {22, prefs::kSwReporterPromptSeed, EnforcementLevel::ENFORCE_ON_LOAD,
1102 PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, 1110 PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
1103 #endif 1111 #endif
@@ -1105,11 +1113,11 @@
1105- PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL}, 1113- PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL},
1106- {24, prefs::kGoogleServicesLastAccountId, EnforcementLevel::ENFORCE_ON_LOAD, 1114- {24, prefs::kGoogleServicesLastAccountId, EnforcementLevel::ENFORCE_ON_LOAD,
1107- PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL}, 1115- PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL},
1108 #if BUILDFLAG(IS_WIN) 1116 #if defined(OS_WIN)
1109 {25, prefs::kSettingsResetPromptPromptWave, 1117 {25, prefs::kSettingsResetPromptPromptWave,
1110 EnforcementLevel::ENFORCE_ON_LOAD, PrefTrackingStrategy::ATOMIC, 1118 EnforcementLevel::ENFORCE_ON_LOAD, PrefTrackingStrategy::ATOMIC,
1111--- a/chrome/browser/prefs/pref_functional_browsertest.cc 1119--- chrome/browser/prefs/pref_functional_browsertest.cc.orig
1112+++ b/chrome/browser/prefs/pref_functional_browsertest.cc 1120+++ chrome/browser/prefs/pref_functional_browsertest.cc
1113@@ -24,7 +24,6 @@ 1121@@ -24,7 +24,6 @@
1114 #include "components/content_settings/core/common/content_settings_types.h" 1122 #include "components/content_settings/core/common/content_settings_types.h"
1115 #include "components/content_settings/core/common/pref_names.h" 1123 #include "components/content_settings/core/common/pref_names.h"
@@ -1119,8 +1127,8 @@
1119 #include "content/public/browser/web_contents.h" 1127 #include "content/public/browser/web_contents.h"
1120 #include "content/public/test/browser_test.h" 1128 #include "content/public/test/browser_test.h"
1121@@ -220,9 +219,6 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTe 1129@@ -220,9 +219,6 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTe
1122 prefetch::SetPreloadPagesState(prefs, 1130 prefs->SetInteger(prefs::kNetworkPredictionOptions,
1123 prefetch::PreloadPagesState::kNoPreloading); 1131 chrome_browser_net::NETWORK_PREDICTION_NEVER);
1124 1132
1125- EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled)); 1133- EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
1126- prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false); 1134- prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false);
@@ -1130,25 +1138,25 @@
1130 1138
1131@@ -236,7 +232,6 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTe 1139@@ -236,7 +232,6 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTe
1132 1140
1133 EXPECT_EQ(prefetch::PreloadPagesState::kNoPreloading, 1141 EXPECT_EQ(chrome_browser_net::NETWORK_PREDICTION_NEVER,
1134 prefetch::GetPreloadPagesState(*prefs)); 1142 prefs->GetInteger(prefs::kNetworkPredictionOptions));
1135- EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled)); 1143- EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
1136 EXPECT_FALSE( 1144 EXPECT_FALSE(
1137 prefs->GetBoolean(embedder_support::kAlternateErrorPagesEnabled)); 1145 prefs->GetBoolean(embedder_support::kAlternateErrorPagesEnabled));
1138 EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled)); 1146 EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
1139--- a/chrome/browser/profiles/gaia_info_update_service.cc 1147--- chrome/browser/profiles/gaia_info_update_service.cc.orig
1140+++ b/chrome/browser/profiles/gaia_info_update_service.cc 1148+++ chrome/browser/profiles/gaia_info_update_service.cc
1141@@ -20,7 +20,6 @@ 1149@@ -19,7 +19,6 @@
1150 #include "chrome/common/pref_names.h"
1142 #include "components/prefs/pref_service.h" 1151 #include "components/prefs/pref_service.h"
1143 #include "components/signin/public/base/avatar_icon_util.h" 1152 #include "components/signin/public/base/avatar_icon_util.h"
1144 #include "components/signin/public/base/consent_level.h"
1145-#include "components/signin/public/base/signin_pref_names.h" 1153-#include "components/signin/public/base/signin_pref_names.h"
1146 #include "components/signin/public/identity_manager/account_info.h" 1154 #include "components/signin/public/identity_manager/account_info.h"
1147 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" 1155 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
1148 #include "content/public/browser/notification_details.h" 1156 #include "components/signin/public/identity_manager/consent_level.h"
1149--- a/chrome/browser/profiles/gaia_info_update_service_unittest.cc 1157--- chrome/browser/profiles/gaia_info_update_service_unittest.cc.orig
1150+++ b/chrome/browser/profiles/gaia_info_update_service_unittest.cc 1158+++ chrome/browser/profiles/gaia_info_update_service_unittest.cc
1151@@ -28,7 +28,6 @@ 1159@@ -27,7 +27,6 @@
1152 #include "chrome/test/base/testing_profile_manager.h" 1160 #include "chrome/test/base/testing_profile_manager.h"
1153 #include "components/prefs/pref_service.h" 1161 #include "components/prefs/pref_service.h"
1154 #include "components/profile_metrics/state.h" 1162 #include "components/profile_metrics/state.h"
@@ -1156,9 +1164,9 @@
1156 #include "components/signin/public/identity_manager/account_info.h" 1164 #include "components/signin/public/identity_manager/account_info.h"
1157 #include "components/sync_preferences/pref_service_syncable.h" 1165 #include "components/sync_preferences/pref_service_syncable.h"
1158 #include "content/public/test/browser_task_environment.h" 1166 #include "content/public/test/browser_task_environment.h"
1159--- a/chrome/browser/profiles/profile_attributes_entry.cc 1167--- chrome/browser/profiles/profile_attributes_entry.cc.orig
1160+++ b/chrome/browser/profiles/profile_attributes_entry.cc 1168+++ chrome/browser/profiles/profile_attributes_entry.cc
1161@@ -26,7 +26,6 @@ 1169@@ -29,7 +29,6 @@
1162 #include "components/prefs/pref_service.h" 1170 #include "components/prefs/pref_service.h"
1163 #include "components/prefs/scoped_user_pref_update.h" 1171 #include "components/prefs/scoped_user_pref_update.h"
1164 #include "components/profile_metrics/state.h" 1172 #include "components/profile_metrics/state.h"
@@ -1166,7 +1174,7 @@
1166 #include "components/signin/public/identity_manager/account_info.h" 1174 #include "components/signin/public/identity_manager/account_info.h"
1167 #include "third_party/abseil-cpp/absl/types/optional.h" 1175 #include "third_party/abseil-cpp/absl/types/optional.h"
1168 #include "ui/base/resource/resource_bundle.h" 1176 #include "ui/base/resource/resource_bundle.h"
1169@@ -486,7 +485,7 @@ bool ProfileAttributesEntry::IsUsingDefa 1177@@ -490,7 +489,7 @@ bool ProfileAttributesEntry::IsUsingDefa
1170 } 1178 }
1171 1179
1172 bool ProfileAttributesEntry::IsSignedInWithCredentialProvider() const { 1180 bool ProfileAttributesEntry::IsSignedInWithCredentialProvider() const {
@@ -1175,7 +1183,7 @@
1175 } 1183 }
1176 1184
1177 size_t ProfileAttributesEntry::GetAvatarIconIndex() const { 1185 size_t ProfileAttributesEntry::GetAvatarIconIndex() const {
1178@@ -666,9 +665,6 @@ void ProfileAttributesEntry::SetLastDown 1186@@ -672,9 +671,6 @@ void ProfileAttributesEntry::SetLastDown
1179 } 1187 }
1180 1188
1181 void ProfileAttributesEntry::SetSignedInWithCredentialProvider(bool value) { 1189 void ProfileAttributesEntry::SetSignedInWithCredentialProvider(bool value) {
@@ -1185,9 +1193,9 @@
1185 } 1193 }
1186 1194
1187 void ProfileAttributesEntry::LockForceSigninProfile(bool is_lock) { 1195 void ProfileAttributesEntry::LockForceSigninProfile(bool is_lock) {
1188--- a/chrome/browser/profiles/profile_attributes_storage.cc 1196--- chrome/browser/profiles/profile_attributes_storage.cc.orig
1189+++ b/chrome/browser/profiles/profile_attributes_storage.cc 1197+++ chrome/browser/profiles/profile_attributes_storage.cc
1190@@ -38,7 +38,6 @@ 1198@@ -36,7 +36,6 @@
1191 #include "components/prefs/scoped_user_pref_update.h" 1199 #include "components/prefs/scoped_user_pref_update.h"
1192 #include "components/profile_metrics/state.h" 1200 #include "components/profile_metrics/state.h"
1193 #include "components/signin/public/base/persistent_repeating_timer.h" 1201 #include "components/signin/public/base/persistent_repeating_timer.h"
@@ -1195,7 +1203,7 @@
1195 #include "content/public/browser/browser_task_traits.h" 1203 #include "content/public/browser/browser_task_traits.h"
1196 #include "content/public/browser/browser_thread.h" 1204 #include "content/public/browser/browser_thread.h"
1197 #include "third_party/icu/source/i18n/unicode/coll.h" 1205 #include "third_party/icu/source/i18n/unicode/coll.h"
1198@@ -376,8 +375,6 @@ void ProfileAttributesStorage::AddProfil 1206@@ -374,8 +373,6 @@ void ProfileAttributesStorage::AddProfil
1199 if (params.account_id.HasAccountIdKey()) 1207 if (params.account_id.HasAccountIdKey())
1200 info.SetStringKey(ProfileAttributesEntry::kAccountIdKey, 1208 info.SetStringKey(ProfileAttributesEntry::kAccountIdKey,
1201 params.account_id.GetAccountIdKey()); 1209 params.account_id.GetAccountIdKey());
@@ -1204,9 +1212,9 @@
1204 attributes->SetKey(key, std::move(info)); 1212 attributes->SetKey(key, std::move(info));
1205 1213
1206 ProfileAttributesEntry* entry = InitEntryWithKey(key, params.is_omitted); 1214 ProfileAttributesEntry* entry = InitEntryWithKey(key, params.is_omitted);
1207--- a/chrome/browser/profiles/profile_impl.cc 1215--- chrome/browser/profiles/profile_impl.cc.orig
1208+++ b/chrome/browser/profiles/profile_impl.cc 1216+++ chrome/browser/profiles/profile_impl.cc
1209@@ -149,7 +149,6 @@ 1217@@ -150,7 +150,6 @@
1210 #include "components/prefs/scoped_user_pref_update.h" 1218 #include "components/prefs/scoped_user_pref_update.h"
1211 #include "components/profile_metrics/browser_profile_type.h" 1219 #include "components/profile_metrics/browser_profile_type.h"
1212 #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" 1220 #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
@@ -1214,17 +1222,17 @@
1214 #include "components/signin/public/identity_manager/identity_manager.h" 1222 #include "components/signin/public/identity_manager/identity_manager.h"
1215 #include "components/site_isolation/site_isolation_policy.h" 1223 #include "components/site_isolation/site_isolation_policy.h"
1216 #include "components/spellcheck/spellcheck_buildflags.h" 1224 #include "components/spellcheck/spellcheck_buildflags.h"
1217--- a/chrome/browser/profiles/profile_manager.cc 1225--- chrome/browser/profiles/profile_manager.cc.orig
1218+++ b/chrome/browser/profiles/profile_manager.cc 1226+++ chrome/browser/profiles/profile_manager.cc
1219@@ -91,7 +91,6 @@ 1227@@ -94,7 +94,6 @@
1220 #include "components/signin/public/base/consent_level.h" 1228 #include "components/search_engines/default_search_manager.h"
1221 #include "components/signin/public/base/signin_buildflags.h" 1229 #include "components/signin/public/base/signin_buildflags.h"
1222 #include "components/signin/public/base/signin_metrics.h" 1230 #include "components/signin/public/base/signin_metrics.h"
1223-#include "components/signin/public/base/signin_pref_names.h" 1231-#include "components/signin/public/base/signin_pref_names.h"
1232 #include "components/signin/public/identity_manager/consent_level.h"
1224 #include "components/signin/public/identity_manager/identity_manager.h" 1233 #include "components/signin/public/identity_manager/identity_manager.h"
1225 #include "components/signin/public/identity_manager/primary_account_mutator.h" 1234 #include "components/signin/public/identity_manager/primary_account_mutator.h"
1226 #include "components/sync/base/stop_source.h" 1235@@ -2105,8 +2104,7 @@ void ProfileManager::AddProfileToStorage
1227@@ -2192,8 +2191,7 @@ void ProfileManager::AddProfileToStorage
1228 entry->SetAuthInfo(account_info.gaia, username, 1236 entry->SetAuthInfo(account_info.gaia, username,
1229 is_consented_primary_account); 1237 is_consented_primary_account);
1230 1238
@@ -1232,9 +1240,9 @@
1232- prefs::kSignedInWithCredentialProvider)); 1240- prefs::kSignedInWithCredentialProvider));
1233+ entry->SetSignedInWithCredentialProvider(false); 1241+ entry->SetSignedInWithCredentialProvider(false);
1234 1242
1235 #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) 1243 #if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
1236 // Sign out if force-sign-in policy is enabled and profile is not signed 1244 // Sign out if force-sign-in policy is enabled and profile is not signed
1237@@ -2248,14 +2246,13 @@ void ProfileManager::AddProfileToStorage 1245@@ -2161,14 +2159,13 @@ void ProfileManager::AddProfileToStorage
1238 1246
1239 init_params.is_ephemeral = IsEphemeral(profile); 1247 init_params.is_ephemeral = IsEphemeral(profile);
1240 init_params.is_signed_in_with_credential_provider = 1248 init_params.is_signed_in_with_credential_provider =
@@ -1250,9 +1258,9 @@
1250 prefs->SetBoolean(bookmarks::prefs::kEditBookmarksEnabled, false); 1258 prefs->SetBoolean(bookmarks::prefs::kEditBookmarksEnabled, false);
1251 prefs->SetBoolean(bookmarks::prefs::kShowBookmarkBar, false); 1259 prefs->SetBoolean(bookmarks::prefs::kShowBookmarkBar, false);
1252 prefs->ClearPref(DefaultSearchManager::kDefaultSearchProviderDataPrefName); 1260 prefs->ClearPref(DefaultSearchManager::kDefaultSearchProviderDataPrefName);
1253--- a/chrome/browser/profiles/profile_window.cc 1261--- chrome/browser/profiles/profile_window.cc.orig
1254+++ b/chrome/browser/profiles/profile_window.cc 1262+++ chrome/browser/profiles/profile_window.cc
1255@@ -41,7 +41,6 @@ 1263@@ -40,7 +40,6 @@
1256 #include "chrome/common/url_constants.h" 1264 #include "chrome/common/url_constants.h"
1257 #include "components/flags_ui/pref_service_flags_storage.h" 1265 #include "components/flags_ui/pref_service_flags_storage.h"
1258 #include "components/prefs/pref_service.h" 1266 #include "components/prefs/pref_service.h"
@@ -1260,8 +1268,8 @@
1260 #include "components/signin/public/identity_manager/account_info.h" 1268 #include "components/signin/public/identity_manager/account_info.h"
1261 #include "components/signin/public/identity_manager/identity_manager.h" 1269 #include "components/signin/public/identity_manager/identity_manager.h"
1262 #include "content/public/browser/browser_thread.h" 1270 #include "content/public/browser/browser_thread.h"
1263--- a/chrome/browser/profiles/profiles_state.cc 1271--- chrome/browser/profiles/profiles_state.cc.orig
1264+++ b/chrome/browser/profiles/profiles_state.cc 1272+++ chrome/browser/profiles/profiles_state.cc
1265@@ -42,7 +42,6 @@ 1273@@ -42,7 +42,6 @@
1266 #include <algorithm> 1274 #include <algorithm>
1267 #include "chrome/browser/profiles/gaia_info_update_service.h" 1275 #include "chrome/browser/profiles/gaia_info_update_service.h"
@@ -1270,24 +1278,24 @@
1270 #endif 1278 #endif
1271 1279
1272 #if BUILDFLAG(IS_CHROMEOS_LACROS) 1280 #if BUILDFLAG(IS_CHROMEOS_LACROS)
1273--- a/chrome/browser/resources/settings/privacy_page/disable_safebrowsing_dialog.html 1281--- chrome/browser/resources/settings/privacy_page/disable_safebrowsing_dialog.html.orig
1274+++ b/chrome/browser/resources/settings/privacy_page/disable_safebrowsing_dialog.html 1282+++ chrome/browser/resources/settings/privacy_page/disable_safebrowsing_dialog.html
1275@@ -1,12 +1,9 @@ 1283@@ -1,12 +1,9 @@
1276 <cr-dialog id="dialog" close-text="$i18n{close}"> 1284 <cr-dialog id="dialog" close-text="$i18n{close}">
1277- <div slot="title">$i18n{safeBrowsingDisableDialog}</div> 1285- <div slot="title">$i18n{safeBrowsingDisableDialog}</div>
1278- <div slot="body">$i18n{safeBrowsingDisableDialogDesc}</div> 1286- <div slot="body">$i18n{safeBrowsingDisableDialogDesc}</div>
1279 <div slot="button-container"> 1287 <div slot="button-container">
1280 <cr-button id="cancel" class="cancel-button" on-click="onDialogCancel_"> 1288 <cr-button class="cancel-button" on-click="onDialogCancel_">
1281 $i18n{cancel} 1289 $i18n{cancel}
1282 </cr-button> 1290 </cr-button>
1283 <cr-button id="confirm" class="action-button" on-click="onDialogConfirm_"> 1291 <cr-button class="action-button" on-click="onDialogConfirm_">
1284- $i18n{safeBrowsingDisableDialogConfirm} 1292- $i18n{safeBrowsingDisableDialogConfirm}
1285 </cr-button> 1293 </cr-button>
1286 </div> 1294 </div>
1287 </cr-dialog> 1295 </cr-dialog>
1288--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html 1296--- chrome/browser/resources/settings/privacy_page/privacy_page.html.orig
1289+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html 1297+++ chrome/browser/resources/settings/privacy_page/privacy_page.html
1290@@ -558,7 +558,7 @@ 1298@@ -535,7 +535,7 @@
1291 </category-setting-exceptions> 1299 </category-setting-exceptions>
1292 </settings-subpage> 1300 </settings-subpage>
1293 </template> 1301 </template>
@@ -1296,9 +1304,9 @@
1296 no-search> 1304 no-search>
1297 <template is="dom-if" route-path="/content/ads" no-search> 1305 <template is="dom-if" route-path="/content/ads" no-search>
1298 <settings-subpage page-title="$i18n{siteSettingsAds}" 1306 <settings-subpage page-title="$i18n{siteSettingsAds}"
1299--- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts 1307--- chrome/browser/resources/settings/privacy_page/privacy_page.ts.orig
1300+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts 1308+++ chrome/browser/resources/settings/privacy_page/privacy_page.ts
1301@@ -101,7 +101,7 @@ export class SettingsPrivacyPageElement 1309@@ -90,7 +90,7 @@ export class SettingsPrivacyPageElement
1302 enableSafeBrowsingSubresourceFilter_: { 1310 enableSafeBrowsingSubresourceFilter_: {
1303 type: Boolean, 1311 type: Boolean,
1304 value() { 1312 value() {
@@ -1307,8 +1315,8 @@
1307 } 1315 }
1308 }, 1316 },
1309 1317
1310--- a/chrome/browser/resources/settings/privacy_page/security_page.html 1318--- chrome/browser/resources/settings/privacy_page/security_page.html.orig
1311+++ b/chrome/browser/resources/settings/privacy_page/security_page.html 1319+++ chrome/browser/resources/settings/privacy_page/security_page.html
1312@@ -53,105 +53,6 @@ 1320@@ -53,105 +53,6 @@
1313 <img id="banner" alt="" 1321 <img id="banner" alt=""
1314 src="chrome://settings/images/safe_browsing_banner.svg"> 1322 src="chrome://settings/images/safe_browsing_banner.svg">
@@ -1415,7 +1423,7 @@
1415 <div class="cr-row first"> 1423 <div class="cr-row first">
1416 <h2>$i18n{advancedPageTitle}</h2> 1424 <h2>$i18n{advancedPageTitle}</h2>
1417 </div> 1425 </div>
1418@@ -213,8 +114,3 @@ 1426@@ -202,8 +103,3 @@
1419 on-click="onAdvancedProtectionProgramLinkClick_" 1427 on-click="onAdvancedProtectionProgramLinkClick_"
1420 external> 1428 external>
1421 </cr-link-row> 1429 </cr-link-row>
@@ -1424,9 +1432,9 @@
1424- on-close="onDisableSafebrowsingDialogClose_"> 1432- on-close="onDisableSafebrowsingDialogClose_">
1425- </settings-disable-safebrowsing-dialog> 1433- </settings-disable-safebrowsing-dialog>
1426- </template> 1434- </template>
1427--- a/chrome/browser/resources/settings/privacy_page/security_page.ts 1435--- chrome/browser/resources/settings/privacy_page/security_page.ts.orig
1428+++ b/chrome/browser/resources/settings/privacy_page/security_page.ts 1436+++ chrome/browser/resources/settings/privacy_page/security_page.ts
1429@@ -196,15 +196,6 @@ export class SettingsSecurityPageElement 1437@@ -182,15 +182,6 @@ export class SettingsSecurityPageElement
1430 1438
1431 ready() { 1439 ready() {
1432 super.ready(); 1440 super.ready();
@@ -1442,7 +1450,7 @@
1442 } 1450 }
1443 1451
1444 /** 1452 /**
1445@@ -253,8 +244,7 @@ export class SettingsSecurityPageElement 1453@@ -239,8 +230,7 @@ export class SettingsSecurityPageElement
1446 } 1454 }
1447 1455
1448 private getDisabledExtendedSafeBrowsing_(): boolean { 1456 private getDisabledExtendedSafeBrowsing_(): boolean {
@@ -1452,9 +1460,9 @@
1452 } 1460 }
1453 1461
1454 private getPasswordsLeakToggleSubLabel_(): string { 1462 private getPasswordsLeakToggleSubLabel_(): string {
1455--- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts 1463--- chrome/browser/resources/settings/site_settings_page/site_settings_page.ts.orig
1456+++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts 1464+++ chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
1457@@ -48,7 +48,7 @@ function getCategoryItemMap(): Map<Conte 1465@@ -47,7 +47,7 @@ function getCategoryItemMap(): Map<Conte
1458 enabledLabel: 'siteSettingsAdsAllowed', 1466 enabledLabel: 'siteSettingsAdsAllowed',
1459 disabledLabel: 'siteSettingsAdsBlocked', 1467 disabledLabel: 'siteSettingsAdsBlocked',
1460 shouldShow: () => 1468 shouldShow: () =>
@@ -1463,8 +1471,8 @@
1463 }, 1471 },
1464 { 1472 {
1465 route: routes.SITE_SETTINGS_AR, 1473 route: routes.SITE_SETTINGS_AR,
1466--- a/chrome/browser/safe_browsing/ad_redirect_trigger_browsertest.cc 1474--- chrome/browser/safe_browsing/ad_redirect_trigger_browsertest.cc.orig
1467+++ b/chrome/browser/safe_browsing/ad_redirect_trigger_browsertest.cc 1475+++ chrome/browser/safe_browsing/ad_redirect_trigger_browsertest.cc
1468@@ -19,7 +19,6 @@ 1476@@ -19,7 +19,6 @@
1469 #include "components/prefs/testing_pref_service.h" 1477 #include "components/prefs/testing_pref_service.h"
1470 #include "components/safe_browsing/content/browser/triggers/ad_redirect_trigger.h" 1478 #include "components/safe_browsing/content/browser/triggers/ad_redirect_trigger.h"
@@ -1473,16 +1481,16 @@
1473 #include "content/public/browser/render_frame_host.h" 1481 #include "content/public/browser/render_frame_host.h"
1474 #include "content/public/browser/web_contents.h" 1482 #include "content/public/browser/web_contents.h"
1475 #include "content/public/test/browser_test.h" 1483 #include "content/public/test/browser_test.h"
1476--- a/chrome/browser/safe_browsing/advanced_protection_status_manager.cc 1484--- chrome/browser/safe_browsing/advanced_protection_status_manager.cc.orig
1477+++ b/chrome/browser/safe_browsing/advanced_protection_status_manager.cc 1485+++ chrome/browser/safe_browsing/advanced_protection_status_manager.cc
1478@@ -13,7 +13,6 @@ 1486@@ -13,7 +13,6 @@
1479 #include "chrome/browser/signin/identity_manager_factory.h" 1487 #include "chrome/browser/signin/identity_manager_factory.h"
1480 #include "components/prefs/pref_service.h" 1488 #include "components/prefs/pref_service.h"
1481 #include "components/safe_browsing/core/common/features.h" 1489 #include "components/safe_browsing/core/common/features.h"
1482-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 1490-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
1483 #include "components/signin/public/base/consent_level.h"
1484 #include "components/signin/public/identity_manager/account_info.h" 1491 #include "components/signin/public/identity_manager/account_info.h"
1485 #include "components/signin/public/identity_manager/accounts_mutator.h" 1492 #include "components/signin/public/identity_manager/accounts_mutator.h"
1493 #include "components/signin/public/identity_manager/consent_level.h"
1486@@ -63,9 +62,7 @@ void AdvancedProtectionStatusManager::Ma 1494@@ -63,9 +62,7 @@ void AdvancedProtectionStatusManager::Ma
1487 1495
1488 is_under_advanced_protection_ = core_info.is_under_advanced_protection; 1496 is_under_advanced_protection_ = core_info.is_under_advanced_protection;
@@ -1516,8 +1524,8 @@
1516 } 1524 }
1517 1525
1518 bool AdvancedProtectionStatusManager::IsUnconsentedPrimaryAccount( 1526 bool AdvancedProtectionStatusManager::IsUnconsentedPrimaryAccount(
1519--- a/chrome/browser/safe_browsing/advanced_protection_status_manager_unittest.cc 1527--- chrome/browser/safe_browsing/advanced_protection_status_manager_unittest.cc.orig
1520+++ b/chrome/browser/safe_browsing/advanced_protection_status_manager_unittest.cc 1528+++ chrome/browser/safe_browsing/advanced_protection_status_manager_unittest.cc
1521@@ -10,7 +10,6 @@ 1529@@ -10,7 +10,6 @@
1522 #include "base/test/task_environment.h" 1530 #include "base/test/task_environment.h"
1523 #include "build/chromeos_buildflags.h" 1531 #include "build/chromeos_buildflags.h"
@@ -1526,18 +1534,18 @@
1526 #include "components/signin/public/identity_manager/account_info.h" 1534 #include "components/signin/public/identity_manager/account_info.h"
1527 #include "components/signin/public/identity_manager/accounts_mutator.h" 1535 #include "components/signin/public/identity_manager/accounts_mutator.h"
1528 #include "components/signin/public/identity_manager/identity_test_environment.h" 1536 #include "components/signin/public/identity_manager/identity_test_environment.h"
1529--- a/chrome/browser/safe_browsing/android/services_delegate_android.h 1537--- chrome/browser/safe_browsing/android/services_delegate_android.h.orig
1530+++ b/chrome/browser/safe_browsing/android/services_delegate_android.h 1538+++ chrome/browser/safe_browsing/android/services_delegate_android.h
1531@@ -6,7 +6,6 @@ 1539@@ -7,7 +7,6 @@
1532 #define CHROME_BROWSER_SAFE_BROWSING_ANDROID_SERVICES_DELEGATE_ANDROID_H_
1533 1540
1541 #include "base/macros.h"
1534 #include "chrome/browser/safe_browsing/services_delegate.h" 1542 #include "chrome/browser/safe_browsing/services_delegate.h"
1535-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 1543-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
1536 1544
1537 namespace safe_browsing { 1545 namespace safe_browsing {
1538 1546
1539--- a/chrome/browser/safe_browsing/certificate_reporting_service.cc 1547--- chrome/browser/safe_browsing/certificate_reporting_service.cc.orig
1540+++ b/chrome/browser/safe_browsing/certificate_reporting_service.cc 1548+++ chrome/browser/safe_browsing/certificate_reporting_service.cc
1541@@ -14,7 +14,6 @@ 1549@@ -14,7 +14,6 @@
1542 #include "chrome/browser/profiles/profile.h" 1550 #include "chrome/browser/profiles/profile.h"
1543 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 1551 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
@@ -1546,9 +1554,9 @@
1546 #include "components/security_interstitials/content/certificate_error_report.h" 1554 #include "components/security_interstitials/content/certificate_error_report.h"
1547 #include "content/public/browser/browser_thread.h" 1555 #include "content/public/browser/browser_thread.h"
1548 #include "services/network/public/cpp/shared_url_loader_factory.h" 1556 #include "services/network/public/cpp/shared_url_loader_factory.h"
1549--- a/chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc 1557--- chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc.orig
1550+++ b/chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc 1558+++ chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc
1551@@ -26,7 +26,6 @@ 1559@@ -27,7 +27,6 @@
1552 #include "chrome/test/base/in_process_browser_test.h" 1560 #include "chrome/test/base/in_process_browser_test.h"
1553 #include "chrome/test/base/ui_test_utils.h" 1561 #include "chrome/test/base/ui_test_utils.h"
1554 #include "components/prefs/pref_service.h" 1562 #include "components/prefs/pref_service.h"
@@ -1556,8 +1564,8 @@
1556 #include "components/security_interstitials/content/cert_report_helper.h" 1564 #include "components/security_interstitials/content/cert_report_helper.h"
1557 #include "components/security_interstitials/content/certificate_error_report.h" 1565 #include "components/security_interstitials/content/certificate_error_report.h"
1558 #include "components/variations/variations_params_manager.h" 1566 #include "components/variations/variations_params_manager.h"
1559--- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.cc 1567--- chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.cc.orig
1560+++ b/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
1561@@ -43,7 +43,6 @@ 1569@@ -43,7 +43,6 @@
1562 #include "components/component_updater/component_updater_service.h" 1570 #include "components/component_updater/component_updater_service.h"
1563 #include "components/component_updater/pref_names.h" 1571 #include "components/component_updater/pref_names.h"
@@ -1566,9 +1574,9 @@
1566 #include "content/public/browser/browser_task_traits.h" 1574 #include "content/public/browser/browser_task_traits.h"
1567 #include "content/public/browser/browser_thread.h" 1575 #include "content/public/browser/browser_thread.h"
1568 #include "net/http/http_status_code.h" 1576 #include "net/http/http_status_code.h"
1569--- a/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc 1577--- chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc.orig
1570+++ b/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc 1578+++ chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc
1571@@ -43,7 +43,6 @@ 1579@@ -44,7 +44,6 @@
1572 #include "components/policy/core/common/mock_configuration_policy_provider.h" 1580 #include "components/policy/core/common/mock_configuration_policy_provider.h"
1573 #include "components/policy/policy_constants.h" 1581 #include "components/policy/policy_constants.h"
1574 #include "components/prefs/pref_service.h" 1582 #include "components/prefs/pref_service.h"
@@ -1576,8 +1584,8 @@
1576 #include "content/public/test/browser_test.h" 1584 #include "content/public/test/browser_test.h"
1577 #include "testing/gmock/include/gmock/gmock.h" 1585 #include "testing/gmock/include/gmock/gmock.h"
1578 #include "testing/gtest/include/gtest/gtest.h" 1586 #include "testing/gtest/include/gtest/gtest.h"
1579--- a/chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.cc 1587--- chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.cc.orig
1580+++ b/chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.cc 1588+++ chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.cc
1581@@ -12,7 +12,6 @@ 1589@@ -12,7 +12,6 @@
1582 #include "chrome/browser/profiles/profile.h" 1590 #include "chrome/browser/profiles/profile.h"
1583 #include "chrome/browser/profiles/profile_manager.h" 1591 #include "chrome/browser/profiles/profile_manager.h"
@@ -1586,9 +1594,9 @@
1586 #include "components/version_info/version_info.h" 1594 #include "components/version_info/version_info.h"
1587 1595
1588 namespace safe_browsing { 1596 namespace safe_browsing {
1589--- a/chrome/browser/safe_browsing/chrome_password_protection_service.cc 1597--- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig
1590+++ b/chrome/browser/safe_browsing/chrome_password_protection_service.cc 1598+++ chrome/browser/safe_browsing/chrome_password_protection_service.cc
1591@@ -64,7 +64,6 @@ 1599@@ -63,7 +63,6 @@
1592 #include "components/safe_browsing/core/browser/verdict_cache_manager.h" 1600 #include "components/safe_browsing/core/browser/verdict_cache_manager.h"
1593 #include "components/safe_browsing/core/common/features.h" 1601 #include "components/safe_browsing/core/common/features.h"
1594 #include "components/safe_browsing/core/common/proto/csd.pb.h" 1602 #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -1596,7 +1604,7 @@
1596 #include "components/safe_browsing/core/common/safebrowsing_constants.h" 1604 #include "components/safe_browsing/core/common/safebrowsing_constants.h"
1597 #include "components/safe_browsing/core/common/utils.h" 1605 #include "components/safe_browsing/core/common/utils.h"
1598 #include "components/security_interstitials/content/unsafe_resource_util.h" 1606 #include "components/security_interstitials/content/unsafe_resource_util.h"
1599@@ -1221,14 +1220,6 @@ bool ChromePasswordProtectionService::Ha 1607@@ -1220,14 +1219,6 @@ bool ChromePasswordProtectionService::Ha
1600 } 1608 }
1601 1609
1602 void ChromePasswordProtectionService::OnWarningTriggerChanged() { 1610 void ChromePasswordProtectionService::OnWarningTriggerChanged() {
@@ -1611,7 +1619,7 @@
1611 // Clears captured enterprise password hashes or GSuite sync password hashes. 1619 // Clears captured enterprise password hashes or GSuite sync password hashes.
1612 password_manager::PasswordReuseManager* reuse_manager = 1620 password_manager::PasswordReuseManager* reuse_manager =
1613 GetPasswordReuseManager(); 1621 GetPasswordReuseManager();
1614@@ -1386,7 +1377,7 @@ PrefService* ChromePasswordProtectionSer 1622@@ -1385,7 +1376,7 @@ PrefService* ChromePasswordProtectionSer
1615 } 1623 }
1616 1624
1617 bool ChromePasswordProtectionService::IsSafeBrowsingEnabled() { 1625 bool ChromePasswordProtectionService::IsSafeBrowsingEnabled() {
@@ -1620,7 +1628,7 @@
1620 } 1628 }
1621 1629
1622 bool ChromePasswordProtectionService::IsExtendedReporting() { 1630 bool ChromePasswordProtectionService::IsExtendedReporting() {
1623@@ -1406,44 +1397,7 @@ bool ChromePasswordProtectionService::Is 1631@@ -1405,44 +1396,7 @@ bool ChromePasswordProtectionService::Is
1624 bool ChromePasswordProtectionService::IsPingingEnabled( 1632 bool ChromePasswordProtectionService::IsPingingEnabled(
1625 LoginReputationClientRequest::TriggerType trigger_type, 1633 LoginReputationClientRequest::TriggerType trigger_type,
1626 ReusedPasswordAccountType password_type) { 1634 ReusedPasswordAccountType password_type) {
@@ -1648,7 +1656,7 @@
1648-// Only saved password and GAIA password reuse warnings are shown to users on 1656-// Only saved password and GAIA password reuse warnings are shown to users on
1649-// Android, so other types of password reuse events should be gated by Safe 1657-// Android, so other types of password reuse events should be gated by Safe
1650-// Browsing extended reporting. 1658-// Browsing extended reporting.
1651-#if BUILDFLAG(IS_ANDROID) 1659-#if defined(OS_ANDROID)
1652- if (password_type.account_type() == 1660- if (password_type.account_type() ==
1653- ReusedPasswordAccountType::SAVED_PASSWORD || 1661- ReusedPasswordAccountType::SAVED_PASSWORD ||
1654- IsSyncingGMAILPasswordWithSignedInProtectionEnabled(password_type)) { 1662- IsSyncingGMAILPasswordWithSignedInProtectionEnabled(password_type)) {
@@ -1666,8 +1674,8 @@
1666 } 1674 }
1667 1675
1668 RequestOutcome ChromePasswordProtectionService::GetPingNotSentReason( 1676 RequestOutcome ChromePasswordProtectionService::GetPingNotSentReason(
1669@@ -1669,22 +1623,6 @@ MaybeCreateCommitDeferringCondition( 1677@@ -1661,22 +1615,6 @@ MaybeCreateNavigationThrottle(content::N
1670 : nullptr; 1678 : nullptr;
1671 } 1679 }
1672 1680
1673-PasswordProtectionTrigger 1681-PasswordProtectionTrigger
@@ -1689,9 +1697,9 @@
1689 bool ChromePasswordProtectionService::IsURLAllowlistedForPasswordEntry( 1697 bool ChromePasswordProtectionService::IsURLAllowlistedForPasswordEntry(
1690 const GURL& url) const { 1698 const GURL& url) const {
1691 if (!profile_) 1699 if (!profile_)
1692--- a/chrome/browser/safe_browsing/chrome_password_protection_service.h 1700--- chrome/browser/safe_browsing/chrome_password_protection_service.h.orig
1693+++ b/chrome/browser/safe_browsing/chrome_password_protection_service.h 1701+++ chrome/browser/safe_browsing/chrome_password_protection_service.h
1694@@ -214,13 +214,6 @@ class ChromePasswordProtectionService : 1702@@ -211,13 +211,6 @@ class ChromePasswordProtectionService :
1695 bool UserClickedThroughSBInterstitial( 1703 bool UserClickedThroughSBInterstitial(
1696 PasswordProtectionRequest* request) override; 1704 PasswordProtectionRequest* request) override;
1697 1705
@@ -1705,9 +1713,9 @@
1705 // If |url| matches Safe Browsing allowlist domains, password protection 1713 // If |url| matches Safe Browsing allowlist domains, password protection
1706 // change password URL, or password protection login URLs in the enterprise 1714 // change password URL, or password protection login URLs in the enterprise
1707 // policy. 1715 // policy.
1708--- a/chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc 1716--- chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc.orig
1709+++ b/chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc 1717+++ chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc
1710@@ -39,7 +39,6 @@ 1718@@ -38,7 +38,6 @@
1711 #include "components/safe_browsing/content/browser/password_protection/password_protection_test_util.h" 1719 #include "components/safe_browsing/content/browser/password_protection/password_protection_test_util.h"
1712 #include "components/safe_browsing/core/browser/password_protection/metrics_util.h" 1720 #include "components/safe_browsing/core/browser/password_protection/metrics_util.h"
1713 #include "components/safe_browsing/core/common/features.h" 1721 #include "components/safe_browsing/core/common/features.h"
@@ -1715,9 +1723,9 @@
1715 #include "components/security_state/core/security_state.h" 1723 #include "components/security_state/core/security_state.h"
1716 #include "components/signin/public/identity_manager/account_info.h" 1724 #include "components/signin/public/identity_manager/account_info.h"
1717 #include "components/signin/public/identity_manager/identity_test_environment.h" 1725 #include "components/signin/public/identity_manager/identity_test_environment.h"
1718--- a/chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc 1726--- chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc.orig
1719+++ b/chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc 1727+++ chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc
1720@@ -29,9 +29,7 @@ 1728@@ -28,9 +28,7 @@
1721 #include "components/prefs/pref_service.h" 1729 #include "components/prefs/pref_service.h"
1722 #include "components/prefs/scoped_user_pref_update.h" 1730 #include "components/prefs/scoped_user_pref_update.h"
1723 #include "components/safe_browsing/content/browser/password_protection/password_protection_request_content.h" 1731 #include "components/safe_browsing/content/browser/password_protection/password_protection_request_content.h"
@@ -1727,8 +1735,8 @@
1727 #include "components/signin/public/identity_manager/identity_manager.h" 1735 #include "components/signin/public/identity_manager/identity_manager.h"
1728 #include "components/signin/public/identity_manager/identity_test_utils.h" 1736 #include "components/signin/public/identity_manager/identity_test_utils.h"
1729 #include "components/sync/driver/sync_service.h" 1737 #include "components/sync/driver/sync_service.h"
1730--- a/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc 1738--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig
1731+++ b/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc 1739+++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
1732@@ -34,7 +34,6 @@ 1740@@ -34,7 +34,6 @@
1733 #include "components/prefs/pref_service.h" 1741 #include "components/prefs/pref_service.h"
1734 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" 1742 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
@@ -1737,9 +1745,9 @@
1737 1745
1738 #include "content/public/browser/browser_task_traits.h" 1746 #include "content/public/browser/browser_task_traits.h"
1739 #include "content/public/browser/browser_thread.h" 1747 #include "content/public/browser/browser_thread.h"
1740--- a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc 1748--- chrome/browser/safe_browsing/download_protection/check_client_download_request.cc.orig
1741+++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc 1749+++ chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
1742@@ -37,7 +37,6 @@ 1750@@ -38,7 +38,6 @@
1743 #include "components/safe_browsing/content/common/file_type_policies.h" 1751 #include "components/safe_browsing/content/common/file_type_policies.h"
1744 #include "components/safe_browsing/core/common/features.h" 1752 #include "components/safe_browsing/core/common/features.h"
1745 #include "components/safe_browsing/core/common/proto/csd.pb.h" 1753 #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -1747,8 +1755,8 @@
1747 #include "components/safe_browsing/core/common/utils.h" 1755 #include "components/safe_browsing/core/common/utils.h"
1748 #include "components/url_matcher/url_matcher.h" 1756 #include "components/url_matcher/url_matcher.h"
1749 #include "content/public/browser/browser_context.h" 1757 #include "content/public/browser/browser_context.h"
1750--- a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc 1758--- chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc.orig
1751+++ b/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
1752@@ -24,7 +24,6 @@ 1760@@ -24,7 +24,6 @@
1753 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" 1761 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
1754 #include "components/safe_browsing/content/common/file_type_policies.h" 1762 #include "components/safe_browsing/content/common/file_type_policies.h"
@@ -1757,9 +1765,9 @@
1757 #include "components/safe_browsing/core/common/utils.h" 1765 #include "components/safe_browsing/core/common/utils.h"
1758 #include "content/public/browser/browser_context.h" 1766 #include "content/public/browser/browser_context.h"
1759 #include "content/public/browser/browser_task_traits.h" 1767 #include "content/public/browser/browser_task_traits.h"
1760--- a/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc 1768--- chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc.orig
1761+++ b/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc 1769+++ chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc
1762@@ -95,7 +95,6 @@ 1770@@ -93,7 +93,6 @@
1763 #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" 1771 #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
1764 #include "components/safe_browsing/core/common/features.h" 1772 #include "components/safe_browsing/core/common/features.h"
1765 #include "components/safe_browsing/core/common/proto/csd.pb.h" 1773 #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -1767,8 +1775,8 @@
1767 #include "components/safe_browsing/core/common/safebrowsing_switches.h" 1775 #include "components/safe_browsing/core/common/safebrowsing_switches.h"
1768 #include "components/signin/public/identity_manager/identity_test_environment.h" 1776 #include "components/signin/public/identity_manager/identity_test_environment.h"
1769 #include "content/public/browser/browser_task_traits.h" 1777 #include "content/public/browser/browser_task_traits.h"
1770--- a/chrome/browser/safe_browsing/generated_safe_browsing_pref.cc 1778--- chrome/browser/safe_browsing/generated_safe_browsing_pref.cc.orig
1771+++ b/chrome/browser/safe_browsing/generated_safe_browsing_pref.cc 1779+++ chrome/browser/safe_browsing/generated_safe_browsing_pref.cc
1772@@ -7,7 +7,6 @@ 1780@@ -7,7 +7,6 @@
1773 #include "chrome/browser/profiles/profile.h" 1781 #include "chrome/browser/profiles/profile.h"
1774 #include "chrome/common/extensions/api/settings_private.h" 1782 #include "chrome/common/extensions/api/settings_private.h"
@@ -1799,7 +1807,7 @@
1799 } 1807 }
1800 1808
1801 extensions::settings_private::SetPrefResult GeneratedSafeBrowsingPref::SetPref( 1809 extensions::settings_private::SetPrefResult GeneratedSafeBrowsingPref::SetPref(
1802@@ -48,37 +32,14 @@ extensions::settings_private::SetPrefRes 1810@@ -48,31 +32,14 @@ extensions::settings_private::SetPrefRes
1803 return extensions::settings_private::SetPrefResult::PREF_TYPE_MISMATCH; 1811 return extensions::settings_private::SetPrefResult::PREF_TYPE_MISMATCH;
1804 1812
1805 // If SBER is forcefully disabled, Enhanced cannot be selected by the user. 1813 // If SBER is forcefully disabled, Enhanced cannot be selected by the user.
@@ -1830,16 +1838,10 @@
1830- profile_->GetPrefs()->SetBoolean(prefs::kSafeBrowsingEnhanced, 1838- profile_->GetPrefs()->SetBoolean(prefs::kSafeBrowsingEnhanced,
1831- selection == SafeBrowsingSetting::ENHANCED); 1839- selection == SafeBrowsingSetting::ENHANCED);
1832- 1840-
1833- // Set ESB not set in sync with Account ESB through TailoredSecurity.
1834- if (selection == SafeBrowsingSetting::ENHANCED) {
1835- profile_->GetPrefs()->SetBoolean(
1836- prefs::kEnhancedProtectionEnabledViaTailoredSecurity, false);
1837- }
1838-
1839 return extensions::settings_private::SetPrefResult::SUCCESS; 1841 return extensions::settings_private::SetPrefResult::SUCCESS;
1840 } 1842 }
1841 1843
1842@@ -89,10 +50,8 @@ GeneratedSafeBrowsingPref::GetPrefObject 1844@@ -83,10 +50,8 @@ GeneratedSafeBrowsingPref::GetPrefObject
1843 pref_object->key = kGeneratedSafeBrowsingPref; 1845 pref_object->key = kGeneratedSafeBrowsingPref;
1844 pref_object->type = extensions::api::settings_private::PREF_TYPE_NUMBER; 1846 pref_object->type = extensions::api::settings_private::PREF_TYPE_NUMBER;
1845 1847
@@ -1852,7 +1854,7 @@
1852 1854
1853 if (safe_browsing_enhanced_enabled && safe_browsing_enabled) { 1855 if (safe_browsing_enhanced_enabled && safe_browsing_enabled) {
1854 pref_object->value = std::make_unique<base::Value>( 1856 pref_object->value = std::make_unique<base::Value>(
1855@@ -122,29 +81,18 @@ void GeneratedSafeBrowsingPref::ApplySaf 1857@@ -116,29 +81,18 @@ void GeneratedSafeBrowsingPref::ApplySaf
1856 // three different preferences. It is possible that these may be in 1858 // three different preferences. It is possible that these may be in
1857 // temporarily conflicting managed states. The enabled preference is always 1859 // temporarily conflicting managed states. The enabled preference is always
1858 // taken as the canonical source of management. 1860 // taken as the canonical source of management.
@@ -1888,7 +1890,7 @@
1888 1890
1889 if (!enabled_enforced && !enabled_recommended && !reporting_enforced) { 1891 if (!enabled_enforced && !enabled_recommended && !reporting_enforced) {
1890 // No relevant policies are applied. 1892 // No relevant policies are applied.
1891@@ -154,8 +102,6 @@ void GeneratedSafeBrowsingPref::ApplySaf 1893@@ -148,8 +102,6 @@ void GeneratedSafeBrowsingPref::ApplySaf
1892 if (enabled_enforced) { 1894 if (enabled_enforced) {
1893 // Preference is fully controlled. 1895 // Preference is fully controlled.
1894 pref_object->enforcement = settings_api::Enforcement::ENFORCEMENT_ENFORCED; 1896 pref_object->enforcement = settings_api::Enforcement::ENFORCEMENT_ENFORCED;
@@ -1897,7 +1899,7 @@
1897 return; 1899 return;
1898 } 1900 }
1899 1901
1900@@ -180,8 +126,6 @@ void GeneratedSafeBrowsingPref::ApplySaf 1902@@ -174,8 +126,6 @@ void GeneratedSafeBrowsingPref::ApplySaf
1901 // Reporting has been forcefully disabled by policy. Enhanced protection is 1903 // Reporting has been forcefully disabled by policy. Enhanced protection is
1902 // thus also implicitly disabled by the same policy. 1904 // thus also implicitly disabled by the same policy.
1903 pref_object->enforcement = settings_api::Enforcement::ENFORCEMENT_ENFORCED; 1905 pref_object->enforcement = settings_api::Enforcement::ENFORCEMENT_ENFORCED;
@@ -1906,9 +1908,9 @@
1906 1908
1907 pref_object->user_selectable_values = 1909 pref_object->user_selectable_values =
1908 std::make_unique<std::vector<std::unique_ptr<base::Value>>>(); 1910 std::make_unique<std::vector<std::unique_ptr<base::Value>>>();
1909--- a/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc 1911--- chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc.orig
1910+++ b/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc 1912+++ chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc
1911@@ -23,7 +23,6 @@ 1913@@ -22,7 +22,6 @@
1912 #include "chrome/test/base/testing_profile.h" 1914 #include "chrome/test/base/testing_profile.h"
1913 #include "chrome/test/base/testing_profile_manager.h" 1915 #include "chrome/test/base/testing_profile_manager.h"
1914 #include "components/safe_browsing/core/common/proto/csd.pb.h" 1916 #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -1916,8 +1918,8 @@
1916 #include "components/sync_preferences/testing_pref_service_syncable.h" 1918 #include "components/sync_preferences/testing_pref_service_syncable.h"
1917 #include "content/public/test/browser_task_environment.h" 1919 #include "content/public/test/browser_task_environment.h"
1918 #include "content/public/test/test_utils.h" 1920 #include "content/public/test/test_utils.h"
1919--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc 1921--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig
1920+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc 1922+++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
1921@@ -42,7 +42,6 @@ 1923@@ -42,7 +42,6 @@
1922 #include "components/prefs/pref_service.h" 1924 #include "components/prefs/pref_service.h"
1923 #include "components/safe_browsing/core/common/features.h" 1925 #include "components/safe_browsing/core/common/features.h"
@@ -1926,8 +1928,8 @@
1926 #include "content/public/browser/browser_thread.h" 1928 #include "content/public/browser/browser_thread.h"
1927 #include "content/public/browser/download_item_utils.h" 1929 #include "content/public/browser/download_item_utils.h"
1928 #include "services/network/public/cpp/shared_url_loader_factory.h" 1930 #include "services/network/public/cpp/shared_url_loader_factory.h"
1929--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc 1931--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc.orig
1930+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc 1932+++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
1931@@ -36,7 +36,6 @@ 1933@@ -36,7 +36,6 @@
1932 #include "chrome/test/base/testing_profile.h" 1934 #include "chrome/test/base/testing_profile.h"
1933 #include "chrome/test/base/testing_profile_manager.h" 1935 #include "chrome/test/base/testing_profile_manager.h"
@@ -1936,8 +1938,8 @@
1936 #include "components/sync_preferences/testing_pref_service_syncable.h" 1938 #include "components/sync_preferences/testing_pref_service_syncable.h"
1937 #include "content/public/test/browser_task_environment.h" 1939 #include "content/public/test/browser_task_environment.h"
1938 #include "extensions/browser/quota_service.h" 1940 #include "extensions/browser/quota_service.h"
1939--- a/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc 1941--- chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc.orig
1940+++ b/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc 1942+++ chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc
1941@@ -43,7 +43,6 @@ 1943@@ -43,7 +43,6 @@
1942 #include "components/history/core/browser/history_database_params.h" 1944 #include "components/history/core/browser/history_database_params.h"
1943 #include "components/history/core/browser/history_service.h" 1945 #include "components/history/core/browser/history_service.h"
@@ -1946,8 +1948,8 @@
1946 #include "components/sync_preferences/testing_pref_service_syncable.h" 1948 #include "components/sync_preferences/testing_pref_service_syncable.h"
1947 #include "content/public/test/browser_task_environment.h" 1949 #include "content/public/test/browser_task_environment.h"
1948 #include "content/public/test/test_utils.h" 1950 #include "content/public/test/test_utils.h"
1949--- a/chrome/browser/safe_browsing/incident_reporting/state_store.cc 1951--- chrome/browser/safe_browsing/incident_reporting/state_store.cc.orig
1950+++ b/chrome/browser/safe_browsing/incident_reporting/state_store.cc 1952+++ chrome/browser/safe_browsing/incident_reporting/state_store.cc
1951@@ -14,7 +14,6 @@ 1953@@ -14,7 +14,6 @@
1952 #include "chrome/browser/safe_browsing/incident_reporting/incident.h" 1954 #include "chrome/browser/safe_browsing/incident_reporting/incident.h"
1953 #include "chrome/browser/safe_browsing/incident_reporting/platform_state_store.h" 1955 #include "chrome/browser/safe_browsing/incident_reporting/platform_state_store.h"
@@ -1956,8 +1958,8 @@
1956 1958
1957 namespace safe_browsing { 1959 namespace safe_browsing {
1958 1960
1959--- a/chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc 1961--- chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc.orig
1960+++ b/chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc 1962+++ chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc
1961@@ -21,7 +21,6 @@ 1963@@ -21,7 +21,6 @@
1962 #include "chrome/test/base/testing_profile.h" 1964 #include "chrome/test/base/testing_profile.h"
1963 #include "chrome/test/base/testing_profile_manager.h" 1965 #include "chrome/test/base/testing_profile_manager.h"
@@ -1966,8 +1968,8 @@
1966 #include "components/sync_preferences/pref_service_syncable.h" 1968 #include "components/sync_preferences/pref_service_syncable.h"
1967 #include "components/sync_preferences/pref_service_syncable_factory.h" 1969 #include "components/sync_preferences/pref_service_syncable_factory.h"
1968 #include "content/public/test/browser_task_environment.h" 1970 #include "content/public/test/browser_task_environment.h"
1969--- a/chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc 1971--- chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc.orig
1970+++ b/chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc 1972+++ chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc
1971@@ -7,7 +7,6 @@ 1973@@ -7,7 +7,6 @@
1972 #include "base/metrics/histogram_functions.h" 1974 #include "base/metrics/histogram_functions.h"
1973 #include "chrome/browser/profiles/profile.h" 1975 #include "chrome/browser/profiles/profile.h"
@@ -1976,9 +1978,9 @@
1976 1978
1977 namespace safe_browsing { 1979 namespace safe_browsing {
1978 1980
1979--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc 1981--- chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc.orig
1980+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc 1982+++ chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
1981@@ -79,7 +79,6 @@ 1983@@ -74,7 +74,6 @@
1982 #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h" 1984 #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h"
1983 #include "components/safe_browsing/core/browser/verdict_cache_manager.h" 1985 #include "components/safe_browsing/core/browser/verdict_cache_manager.h"
1984 #include "components/safe_browsing/core/common/features.h" 1986 #include "components/safe_browsing/core/common/features.h"
@@ -1986,9 +1988,9 @@
1986 #include "components/safe_browsing/core/common/web_ui_constants.h" 1988 #include "components/safe_browsing/core/common/web_ui_constants.h"
1987 #include "components/security_interstitials/content/security_interstitial_controller_client.h" 1989 #include "components/security_interstitials/content/security_interstitial_controller_client.h"
1988 #include "components/security_interstitials/content/security_interstitial_tab_helper.h" 1990 #include "components/security_interstitials/content/security_interstitial_tab_helper.h"
1989--- a/chrome/browser/safe_browsing/safe_browsing_service.cc 1991--- chrome/browser/safe_browsing/safe_browsing_service.cc.orig
1990+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc 1992+++ chrome/browser/safe_browsing/safe_browsing_service.cc
1991@@ -121,7 +121,6 @@ base::FilePath SafeBrowsingService::GetB 1993@@ -103,7 +103,6 @@ base::FilePath SafeBrowsingService::GetB
1992 1994
1993 SafeBrowsingService::SafeBrowsingService() 1995 SafeBrowsingService::SafeBrowsingService()
1994 : services_delegate_(ServicesDelegate::Create(this)), 1996 : services_delegate_(ServicesDelegate::Create(this)),
@@ -1996,7 +1998,7 @@
1996 shutdown_(false), 1998 shutdown_(false),
1997 enabled_(false), 1999 enabled_(false),
1998 enabled_by_prefs_(false) {} 2000 enabled_by_prefs_(false) {}
1999@@ -249,8 +248,6 @@ TriggerManager* SafeBrowsingService::tri 2001@@ -257,8 +256,6 @@ TriggerManager* SafeBrowsingService::tri
2000 2002
2001 PasswordProtectionService* SafeBrowsingService::GetPasswordProtectionService( 2003 PasswordProtectionService* SafeBrowsingService::GetPasswordProtectionService(
2002 Profile* profile) const { 2004 Profile* profile) const {
@@ -2005,7 +2007,7 @@
2005 return nullptr; 2007 return nullptr;
2006 } 2008 }
2007 2009
2008@@ -342,9 +339,6 @@ void SafeBrowsingService::OnProfileAdded 2010@@ -387,9 +384,6 @@ void SafeBrowsingService::OnProfileAdded
2009 std::unique_ptr<PrefChangeRegistrar> registrar = 2011 std::unique_ptr<PrefChangeRegistrar> registrar =
2010 std::make_unique<PrefChangeRegistrar>(); 2012 std::make_unique<PrefChangeRegistrar>();
2011 registrar->Init(pref_service); 2013 registrar->Init(pref_service);
@@ -2015,7 +2017,7 @@
2015 // ClientSideDetectionService will need to be refresh the models 2017 // ClientSideDetectionService will need to be refresh the models
2016 // renderers have if extended-reporting changes. 2018 // renderers have if extended-reporting changes.
2017 registrar->Add(prefs::kSafeBrowsingScoutReportingEnabled, 2019 registrar->Add(prefs::kSafeBrowsingScoutReportingEnabled,
2018@@ -373,14 +367,6 @@ void SafeBrowsingService::OnProfileAdded 2020@@ -418,14 +412,6 @@ void SafeBrowsingService::OnProfileAdded
2019 NoCachedPopulationReason::kChangeMbbPref)); 2021 NoCachedPopulationReason::kChangeMbbPref));
2020 user_population_prefs_[pref_service] = std::move(registrar); 2022 user_population_prefs_[pref_service] = std::move(registrar);
2021 2023
@@ -2030,7 +2032,7 @@
2030 // Extended Reporting metrics are handled together elsewhere. 2032 // Extended Reporting metrics are handled together elsewhere.
2031 RecordExtendedReportingMetrics(*pref_service); 2033 RecordExtendedReportingMetrics(*pref_service);
2032 2034
2033@@ -423,18 +409,6 @@ void SafeBrowsingService::RefreshState() 2035@@ -465,18 +451,6 @@ void SafeBrowsingService::RefreshState()
2034 2036
2035 // Check if any profile requires the service to be active. 2037 // Check if any profile requires the service to be active.
2036 enabled_by_prefs_ = false; 2038 enabled_by_prefs_ = false;
@@ -2049,9 +2051,9 @@
2049 2051
2050 if (enabled_by_prefs_) 2052 if (enabled_by_prefs_)
2051 Start(); 2053 Start();
2052--- a/chrome/browser/safe_browsing/safe_browsing_service.h 2054--- chrome/browser/safe_browsing/safe_browsing_service.h.orig
2053+++ b/chrome/browser/safe_browsing/safe_browsing_service.h 2055+++ chrome/browser/safe_browsing/safe_browsing_service.h
2054@@ -27,7 +27,6 @@ 2056@@ -28,7 +28,6 @@
2055 #include "components/safe_browsing/buildflags.h" 2057 #include "components/safe_browsing/buildflags.h"
2056 #include "components/safe_browsing/content/browser/safe_browsing_service_interface.h" 2058 #include "components/safe_browsing/content/browser/safe_browsing_service_interface.h"
2057 #include "components/safe_browsing/core/browser/db/util.h" 2059 #include "components/safe_browsing/core/browser/db/util.h"
@@ -2059,7 +2061,7 @@
2059 #include "content/public/browser/browser_context.h" 2061 #include "content/public/browser/browser_context.h"
2060 #include "content/public/browser/browser_thread.h" 2062 #include "content/public/browser/browser_thread.h"
2061 #include "services/network/public/mojom/network_context.mojom-forward.h" 2063 #include "services/network/public/mojom/network_context.mojom-forward.h"
2062@@ -94,15 +93,6 @@ class SafeBrowsingService : public SafeB 2064@@ -97,15 +96,6 @@ class SafeBrowsingService : public SafeB
2063 // Called on the main thread to let us know that the io_thread is going away. 2065 // Called on the main thread to let us know that the io_thread is going away.
2064 void ShutDown(); 2066 void ShutDown();
2065 2067
@@ -2075,9 +2077,9 @@
2075 // Get current enabled status. Must be called on IO thread. 2077 // Get current enabled status. Must be called on IO thread.
2076 bool enabled() const { 2078 bool enabled() const {
2077 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 2079 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
2078@@ -267,10 +257,6 @@ class SafeBrowsingService : public SafeB 2080@@ -287,10 +277,6 @@ class SafeBrowsingService : public SafeB
2079 2081 // Provides phishing and malware statistics. Accessed on UI thread.
2080 std::unique_ptr<ProxyConfigMonitor> proxy_config_monitor_; 2082 std::unique_ptr<PingManager> ping_manager_;
2081 2083
2082- // Whether SafeBrowsing Extended Reporting is enabled by the current set of 2084- // Whether SafeBrowsing Extended Reporting is enabled by the current set of
2083- // profiles. Updated on the UI thread. 2085- // profiles. Updated on the UI thread.
@@ -2086,9 +2088,9 @@
2086 // Whether the service has been shutdown. 2088 // Whether the service has been shutdown.
2087 bool shutdown_; 2089 bool shutdown_;
2088 2090
2089--- a/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc 2091--- chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc.orig
2090+++ b/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc 2092+++ chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc
2091@@ -28,7 +28,6 @@ 2093@@ -27,7 +27,6 @@
2092 #include "components/safe_browsing/core/browser/db/database_manager.h" 2094 #include "components/safe_browsing/core/browser/db/database_manager.h"
2093 #include "components/safe_browsing/core/browser/ping_manager.h" 2095 #include "components/safe_browsing/core/browser/ping_manager.h"
2094 #include "components/safe_browsing/core/common/features.h" 2096 #include "components/safe_browsing/core/common/features.h"
@@ -2096,7 +2098,7 @@
2096 #include "content/public/browser/browser_task_traits.h" 2098 #include "content/public/browser/browser_task_traits.h"
2097 #include "content/public/browser/browser_thread.h" 2099 #include "content/public/browser/browser_thread.h"
2098 #include "content/public/browser/download_item_utils.h" 2100 #include "content/public/browser/download_item_utils.h"
2099@@ -140,11 +139,9 @@ bool AndroidTelemetryService::CanSendPin 2101@@ -142,11 +141,9 @@ bool AndroidTelemetryService::CanSendPin
2100 return false; 2102 return false;
2101 } 2103 }
2102 2104
@@ -2111,9 +2113,9 @@
2111 2113
2112 if (profile_->IsOffTheRecord()) { 2114 if (profile_->IsOffTheRecord()) {
2113 RecordApkDownloadTelemetryOutcome( 2115 RecordApkDownloadTelemetryOutcome(
2114--- a/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc 2116--- chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc.orig
2115+++ b/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc 2117+++ chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc
2116@@ -20,7 +20,6 @@ 2118@@ -18,7 +18,6 @@
2117 #include "components/download/public/common/mock_download_item.h" 2119 #include "components/download/public/common/mock_download_item.h"
2118 #include "components/prefs/pref_service.h" 2120 #include "components/prefs/pref_service.h"
2119 #include "components/safe_browsing/core/common/features.h" 2121 #include "components/safe_browsing/core/common/features.h"
@@ -2121,8 +2123,8 @@
2121 #include "content/public/browser/browser_task_traits.h" 2123 #include "content/public/browser/browser_task_traits.h"
2122 #include "content/public/browser/browser_thread.h" 2124 #include "content/public/browser/browser_thread.h"
2123 #include "content/public/browser/download_item_utils.h" 2125 #include "content/public/browser/download_item_utils.h"
2124--- a/chrome/browser/safe_browsing/url_checker_delegate_impl.cc 2126--- chrome/browser/safe_browsing/url_checker_delegate_impl.cc.orig
2125+++ b/chrome/browser/safe_browsing/url_checker_delegate_impl.cc 2127+++ chrome/browser/safe_browsing/url_checker_delegate_impl.cc
2126@@ -21,7 +21,6 @@ 2128@@ -21,7 +21,6 @@
2127 #include "components/safe_browsing/core/browser/db/database_manager.h" 2129 #include "components/safe_browsing/core/browser/db/database_manager.h"
2128 #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" 2130 #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
@@ -2131,9 +2133,9 @@
2131 #include "components/security_interstitials/content/unsafe_resource_util.h" 2133 #include "components/security_interstitials/content/unsafe_resource_util.h"
2132 #include "content/public/browser/browser_task_traits.h" 2134 #include "content/public/browser/browser_task_traits.h"
2133 #include "content/public/browser/browser_thread.h" 2135 #include "content/public/browser/browser_thread.h"
2134--- a/chrome/browser/signin/account_consistency_mode_manager.cc 2136--- chrome/browser/signin/account_consistency_mode_manager.cc.orig
2135+++ b/chrome/browser/signin/account_consistency_mode_manager.cc 2137+++ chrome/browser/signin/account_consistency_mode_manager.cc
2136@@ -20,7 +20,6 @@ 2138@@ -19,7 +19,6 @@
2137 #include "components/pref_registry/pref_registry_syncable.h" 2139 #include "components/pref_registry/pref_registry_syncable.h"
2138 #include "components/prefs/pref_service.h" 2140 #include "components/prefs/pref_service.h"
2139 #include "components/signin/public/base/signin_buildflags.h" 2141 #include "components/signin/public/base/signin_buildflags.h"
@@ -2141,7 +2143,7 @@
2141 #include "google_apis/google_api_keys.h" 2143 #include "google_apis/google_api_keys.h"
2142 2144
2143 #if BUILDFLAG(IS_CHROMEOS_ASH) 2145 #if BUILDFLAG(IS_CHROMEOS_ASH)
2144@@ -97,7 +96,6 @@ AccountConsistencyModeManager::AccountCo 2146@@ -98,7 +97,6 @@ AccountConsistencyModeManager::AccountCo
2145 // pref. 2147 // pref.
2146 bool signin_allowed = IsDiceSignInAllowed() && 2148 bool signin_allowed = IsDiceSignInAllowed() &&
2147 prefs->GetBoolean(prefs::kSigninAllowedOnNextStartup); 2149 prefs->GetBoolean(prefs::kSigninAllowedOnNextStartup);
@@ -2149,8 +2151,8 @@
2149 2151
2150 UMA_HISTOGRAM_BOOLEAN("Signin.SigninAllowed", signin_allowed); 2152 UMA_HISTOGRAM_BOOLEAN("Signin.SigninAllowed", signin_allowed);
2151 #endif 2153 #endif
2152@@ -192,16 +190,7 @@ AccountConsistencyModeManager::ComputeAc 2154@@ -196,16 +194,7 @@ AccountConsistencyModeManager::ComputeAc
2153 return AccountConsistencyMethod::kMirror; 2155 // AccountManager is not available, when DICE has been disabled on Lacros.
2154 #endif 2156 #endif
2155 2157
2156-#if BUILDFLAG(ENABLE_DICE_SUPPORT) 2158-#if BUILDFLAG(ENABLE_DICE_SUPPORT)
@@ -2166,9 +2168,9 @@
2166- NOTREACHED(); 2168- NOTREACHED();
2167 return AccountConsistencyMethod::kDisabled; 2169 return AccountConsistencyMethod::kDisabled;
2168 } 2170 }
2169--- a/chrome/browser/signin/account_consistency_mode_manager_unittest.cc 2171--- chrome/browser/signin/account_consistency_mode_manager_unittest.cc.orig
2170+++ b/chrome/browser/signin/account_consistency_mode_manager_unittest.cc 2172+++ chrome/browser/signin/account_consistency_mode_manager_unittest.cc
2171@@ -19,7 +19,6 @@ 2173@@ -20,7 +20,6 @@
2172 #include "components/prefs/testing_pref_store.h" 2174 #include "components/prefs/testing_pref_store.h"
2173 #include "components/signin/public/base/account_consistency_method.h" 2175 #include "components/signin/public/base/account_consistency_method.h"
2174 #include "components/signin/public/base/signin_buildflags.h" 2176 #include "components/signin/public/base/signin_buildflags.h"
@@ -2176,8 +2178,8 @@
2176 #include "components/sync_preferences/testing_pref_service_syncable.h" 2178 #include "components/sync_preferences/testing_pref_service_syncable.h"
2177 #include "content/public/test/browser_task_environment.h" 2179 #include "content/public/test/browser_task_environment.h"
2178 #include "testing/gtest/include/gtest/gtest.h" 2180 #include "testing/gtest/include/gtest/gtest.h"
2179--- a/chrome/browser/signin/chrome_device_id_helper.cc 2181--- chrome/browser/signin/chrome_device_id_helper.cc.orig
2180+++ b/chrome/browser/signin/chrome_device_id_helper.cc 2182+++ chrome/browser/signin/chrome_device_id_helper.cc
2181@@ -16,7 +16,6 @@ 2183@@ -16,7 +16,6 @@
2182 #include "base/logging.h" 2184 #include "base/logging.h"
2183 #include "chrome/browser/ash/profiles/profile_helper.h" 2185 #include "chrome/browser/ash/profiles/profile_helper.h"
@@ -2212,8 +2214,8 @@
2212 } 2214 }
2213 2215
2214 #endif 2216 #endif
2215--- a/chrome/browser/signin/chrome_signin_client.cc 2217--- chrome/browser/signin/chrome_signin_client.cc.orig
2216+++ b/chrome/browser/signin/chrome_signin_client.cc 2218+++ chrome/browser/signin/chrome_signin_client.cc
2217@@ -38,7 +38,6 @@ 2219@@ -38,7 +38,6 @@
2218 #include "components/prefs/pref_service.h" 2220 #include "components/prefs/pref_service.h"
2219 #include "components/signin/core/browser/cookie_settings_util.h" 2221 #include "components/signin/core/browser/cookie_settings_util.h"
@@ -2222,8 +2224,8 @@
2222 #include "components/signin/public/identity_manager/access_token_info.h" 2224 #include "components/signin/public/identity_manager/access_token_info.h"
2223 #include "components/signin/public/identity_manager/identity_manager.h" 2225 #include "components/signin/public/identity_manager/identity_manager.h"
2224 #include "components/signin/public/identity_manager/scope_set.h" 2226 #include "components/signin/public/identity_manager/scope_set.h"
2225--- a/chrome/browser/signin/chromeos_mirror_account_consistency_browsertest.cc 2227--- chrome/browser/signin/chromeos_mirror_account_consistency_browsertest.cc.orig
2226+++ b/chrome/browser/signin/chromeos_mirror_account_consistency_browsertest.cc 2228+++ chrome/browser/signin/chromeos_mirror_account_consistency_browsertest.cc
2227@@ -21,7 +21,6 @@ 2229@@ -21,7 +21,6 @@
2228 #include "components/network_session_configurator/common/network_switches.h" 2230 #include "components/network_session_configurator/common/network_switches.h"
2229 #include "components/prefs/pref_service.h" 2231 #include "components/prefs/pref_service.h"
@@ -2232,8 +2234,8 @@
2232 #include "components/signin/public/identity_manager/identity_test_utils.h" 2234 #include "components/signin/public/identity_manager/identity_test_utils.h"
2233 #include "components/user_manager/user.h" 2235 #include "components/user_manager/user.h"
2234 #include "components/user_manager/user_manager.h" 2236 #include "components/user_manager/user_manager.h"
2235--- a/chrome/browser/signin/dice_browsertest.cc 2237--- chrome/browser/signin/dice_browsertest.cc.orig
2236+++ b/chrome/browser/signin/dice_browsertest.cc 2238+++ chrome/browser/signin/dice_browsertest.cc
2237@@ -59,7 +59,6 @@ 2239@@ -59,7 +59,6 @@
2238 #include "components/signin/public/base/account_consistency_method.h" 2240 #include "components/signin/public/base/account_consistency_method.h"
2239 #include "components/signin/public/base/signin_client.h" 2241 #include "components/signin/public/base/signin_client.h"
@@ -2242,8 +2244,8 @@
2242 #include "components/signin/public/identity_manager/identity_manager.h" 2244 #include "components/signin/public/identity_manager/identity_manager.h"
2243 #include "components/signin/public/identity_manager/identity_test_utils.h" 2245 #include "components/signin/public/identity_manager/identity_test_utils.h"
2244 #include "components/signin/public/identity_manager/primary_account_mutator.h" 2246 #include "components/signin/public/identity_manager/primary_account_mutator.h"
2245--- a/chrome/browser/signin/header_modification_delegate_impl.cc 2247--- chrome/browser/signin/header_modification_delegate_impl.cc.orig
2246+++ b/chrome/browser/signin/header_modification_delegate_impl.cc 2248+++ chrome/browser/signin/header_modification_delegate_impl.cc
2247@@ -15,7 +15,6 @@ 2249@@ -15,7 +15,6 @@
2248 #include "chrome/browser/sync/sync_service_factory.h" 2250 #include "chrome/browser/sync/sync_service_factory.h"
2249 #include "chrome/common/pref_names.h" 2251 #include "chrome/common/pref_names.h"
@@ -2261,8 +2263,8 @@
2261 #endif 2263 #endif
2262 cookie_settings_.get()); 2264 cookie_settings_.get());
2263 } 2265 }
2264--- a/chrome/browser/signin/mirror_browsertest.cc 2266--- chrome/browser/signin/mirror_browsertest.cc.orig
2265+++ b/chrome/browser/signin/mirror_browsertest.cc 2267+++ chrome/browser/signin/mirror_browsertest.cc
2266@@ -31,7 +31,6 @@ 2268@@ -31,7 +31,6 @@
2267 #include "components/prefs/pref_service.h" 2269 #include "components/prefs/pref_service.h"
2268 #include "components/signin/core/browser/dice_header_helper.h" 2270 #include "components/signin/core/browser/dice_header_helper.h"
@@ -2271,17 +2273,17 @@
2271 #include "content/public/common/content_client.h" 2273 #include "content/public/common/content_client.h"
2272 #include "content/public/test/browser_test.h" 2274 #include "content/public/test/browser_test.h"
2273 #include "google_apis/gaia/gaia_urls.h" 2275 #include "google_apis/gaia/gaia_urls.h"
2274--- a/chrome/browser/signin/signin_manager.cc 2276--- chrome/browser/signin/signin_manager.cc.orig
2275+++ b/chrome/browser/signin/signin_manager.cc 2277+++ chrome/browser/signin/signin_manager.cc
2276@@ -7,7 +7,6 @@ 2278@@ -5,7 +5,6 @@
2277 #include "build/build_config.h" 2279 #include "chrome/browser/signin/signin_manager.h"
2278 #include "build/chromeos_buildflags.h" 2280
2279 #include "components/prefs/pref_service.h" 2281 #include "components/prefs/pref_service.h"
2280-#include "components/signin/public/base/signin_pref_names.h" 2282-#include "components/signin/public/base/signin_pref_names.h"
2281 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" 2283 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
2282 #include "components/signin/public/identity_manager/identity_manager.h" 2284 #include "components/signin/public/identity_manager/identity_manager.h"
2283 #include "components/signin/public/identity_manager/primary_account_mutator.h" 2285 #include "components/signin/public/identity_manager/primary_account_mutator.h"
2284@@ -15,11 +14,6 @@ 2286@@ -13,11 +12,6 @@
2285 SigninManager::SigninManager(PrefService* prefs, 2287 SigninManager::SigninManager(PrefService* prefs,
2286 signin::IdentityManager* identity_manager) 2288 signin::IdentityManager* identity_manager)
2287 : prefs_(prefs), identity_manager_(identity_manager) { 2289 : prefs_(prefs), identity_manager_(identity_manager) {
@@ -2291,9 +2293,9 @@
2291- base::Unretained(this))); 2293- base::Unretained(this)));
2292- 2294-
2293 UpdateUnconsentedPrimaryAccount(); 2295 UpdateUnconsentedPrimaryAccount();
2294 identity_manager_observation_.Observe(identity_manager_); 2296 identity_manager_->AddObserver(this);
2295 } 2297 }
2296@@ -77,16 +71,6 @@ CoreAccountInfo SigninManager::ComputeUn 2298@@ -63,16 +57,6 @@ SigninManager::ComputeUnconsentedPrimary
2297 signin::ConsentLevel::kSync); 2299 signin::ConsentLevel::kSync);
2298 } 2300 }
2299 2301
@@ -2305,13 +2307,13 @@
2305- // It was considered simpler to keep the logic to update the unconsented 2307- // It was considered simpler to keep the logic to update the unconsented
2306- // primary account in a single place. 2308- // primary account in a single place.
2307- if (!signin_allowed_.GetValue()) 2309- if (!signin_allowed_.GetValue())
2308- return CoreAccountInfo(); 2310- return absl::nullopt;
2309- 2311-
2310 signin::AccountsInCookieJarInfo cookie_info = 2312 signin::AccountsInCookieJarInfo cookie_info =
2311 identity_manager_->GetAccountsInCookieJar(); 2313 identity_manager_->GetAccountsInCookieJar();
2312 2314
2313--- a/chrome/browser/signin/signin_promo_util.cc 2315--- chrome/browser/signin/signin_promo_util.cc.orig
2314+++ b/chrome/browser/signin/signin_promo_util.cc 2316+++ chrome/browser/signin/signin_promo_util.cc
2315@@ -8,7 +8,6 @@ 2317@@ -8,7 +8,6 @@
2316 #include "chrome/browser/profiles/profile.h" 2318 #include "chrome/browser/profiles/profile.h"
2317 #include "chrome/browser/signin/identity_manager_factory.h" 2319 #include "chrome/browser/signin/identity_manager_factory.h"
@@ -2329,19 +2331,19 @@
2329 return false; 2331 return false;
2330 2332
2331 // Display the signin promo if the user is not signed in. 2333 // Display the signin promo if the user is not signed in.
2332--- a/chrome/browser/signin/signin_ui_util.cc 2334--- chrome/browser/signin/signin_ui_util.cc.orig
2333+++ b/chrome/browser/signin/signin_ui_util.cc 2335+++ chrome/browser/signin/signin_ui_util.cc
2334@@ -39,7 +39,6 @@ 2336@@ -34,7 +34,6 @@
2337 #include "components/feature_engagement/public/tracker.h"
2335 #include "components/prefs/pref_service.h" 2338 #include "components/prefs/pref_service.h"
2336 #include "components/signin/public/base/consent_level.h"
2337 #include "components/signin/public/base/signin_metrics.h" 2339 #include "components/signin/public/base/signin_metrics.h"
2338-#include "components/signin/public/base/signin_pref_names.h" 2340-#include "components/signin/public/base/signin_pref_names.h"
2339 #include "components/signin/public/identity_manager/account_info.h" 2341 #include "components/signin/public/identity_manager/account_info.h"
2340 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" 2342 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
2341 #include "components/signin/public/identity_manager/identity_manager.h" 2343 #include "components/signin/public/identity_manager/consent_level.h"
2342--- a/chrome/browser/signin/signin_util.cc 2344--- chrome/browser/signin/signin_util.cc.orig
2343+++ b/chrome/browser/signin/signin_util.cc 2345+++ chrome/browser/signin/signin_util.cc
2344@@ -31,7 +31,6 @@ 2346@@ -30,7 +30,6 @@
2345 #include "components/google/core/common/google_util.h" 2347 #include "components/google/core/common/google_util.h"
2346 #include "components/prefs/pref_service.h" 2348 #include "components/prefs/pref_service.h"
2347 #include "components/signin/public/base/signin_metrics.h" 2349 #include "components/signin/public/base/signin_metrics.h"
@@ -2349,7 +2351,7 @@
2349 #include "components/signin/public/identity_manager/identity_manager.h" 2351 #include "components/signin/public/identity_manager/identity_manager.h"
2350 #include "components/signin/public/identity_manager/identity_utils.h" 2352 #include "components/signin/public/identity_manager/identity_utils.h"
2351 #include "components/signin/public/identity_manager/primary_account_mutator.h" 2353 #include "components/signin/public/identity_manager/primary_account_mutator.h"
2352@@ -299,7 +298,7 @@ void EnsurePrimaryAccountAllowedForProfi 2354@@ -232,7 +231,7 @@ void EnsurePrimaryAccountAllowedForProfi
2353 2355
2354 CoreAccountInfo primary_account = 2356 CoreAccountInfo primary_account =
2355 identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync); 2357 identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync);
@@ -2358,8 +2360,8 @@
2358 signin::IsUsernameAllowedByPatternFromPrefs( 2360 signin::IsUsernameAllowedByPatternFromPrefs(
2359 g_browser_process->local_state(), primary_account.email)) { 2361 g_browser_process->local_state(), primary_account.email)) {
2360 return; 2362 return;
2361--- a/chrome/browser/signin/signin_util_win.cc 2363--- chrome/browser/signin/signin_util_win.cc.orig
2362+++ b/chrome/browser/signin/signin_util_win.cc 2364+++ chrome/browser/signin/signin_util_win.cc
2363@@ -34,7 +34,6 @@ 2365@@ -34,7 +34,6 @@
2364 #include "components/prefs/pref_service.h" 2366 #include "components/prefs/pref_service.h"
2365 #include "components/signin/core/browser/about_signin_internals.h" 2367 #include "components/signin/core/browser/about_signin_internals.h"
@@ -2368,8 +2370,8 @@
2368 #include "components/signin/public/identity_manager/accounts_mutator.h" 2370 #include "components/signin/public/identity_manager/accounts_mutator.h"
2369 #include "components/signin/public/identity_manager/identity_manager.h" 2371 #include "components/signin/public/identity_manager/identity_manager.h"
2370 2372
2371@@ -134,9 +133,6 @@ void ImportCredentialsFromProvider(Profi 2373@@ -136,9 +135,6 @@ void ImportCredentialsFromProvider(Profi
2372 account_id, nullptr, profile)); 2374 account_id, nullptr));
2373 } 2375 }
2374 } 2376 }
2375- 2377-
@@ -2378,7 +2380,7 @@
2378 } 2380 }
2379 2381
2380 // Extracts the |cred_provider_gaia_id| and |cred_provider_email| for the user 2382 // Extracts the |cred_provider_gaia_id| and |cred_provider_email| for the user
2381@@ -311,20 +307,7 @@ bool ReauthWithCredentialProviderIfPossi 2383@@ -313,20 +309,7 @@ bool ReauthWithCredentialProviderIfPossi
2382 // - The profile is marked as having been signed in with a system credential. 2384 // - The profile is marked as having been signed in with a system credential.
2383 // - The profile is already signed in. 2385 // - The profile is already signed in.
2384 // - The profile is in an auth error state. 2386 // - The profile is in an auth error state.
@@ -2399,9 +2401,9 @@
2399 } 2401 }
2400 2402
2401 } // namespace signin_util 2403 } // namespace signin_util
2402--- a/chrome/browser/signin/signin_util_win_browsertest.cc 2404--- chrome/browser/signin/signin_util_win_browsertest.cc.orig
2403+++ b/chrome/browser/signin/signin_util_win_browsertest.cc 2405+++ chrome/browser/signin/signin_util_win_browsertest.cc
2404@@ -30,7 +30,6 @@ 2406@@ -31,7 +31,6 @@
2405 #include "chrome/test/base/in_process_browser_test.h" 2407 #include "chrome/test/base/in_process_browser_test.h"
2406 #include "chrome/test/base/testing_browser_process.h" 2408 #include "chrome/test/base/testing_browser_process.h"
2407 #include "components/prefs/pref_service.h" 2409 #include "components/prefs/pref_service.h"
@@ -2409,9 +2411,9 @@
2409 #include "components/signin/public/identity_manager/identity_manager.h" 2411 #include "components/signin/public/identity_manager/identity_manager.h"
2410 #include "components/signin/public/identity_manager/identity_test_utils.h" 2412 #include "components/signin/public/identity_manager/identity_test_utils.h"
2411 #include "components/signin/public/identity_manager/primary_account_mutator.h" 2413 #include "components/signin/public/identity_manager/primary_account_mutator.h"
2412--- a/chrome/browser/ssl/certificate_reporting_test_utils.cc 2414--- chrome/browser/ssl/certificate_reporting_test_utils.cc.orig
2413+++ b/chrome/browser/ssl/certificate_reporting_test_utils.cc 2415+++ chrome/browser/ssl/certificate_reporting_test_utils.cc
2414@@ -14,7 +14,6 @@ 2416@@ -15,7 +15,6 @@
2415 #include "build/build_config.h" 2417 #include "build/build_config.h"
2416 #include "chrome/browser/profiles/profile.h" 2418 #include "chrome/browser/profiles/profile.h"
2417 #include "components/prefs/pref_service.h" 2419 #include "components/prefs/pref_service.h"
@@ -2419,38 +2421,29 @@
2419 #include "components/security_interstitials/content/cert_report_helper.h" 2421 #include "components/security_interstitials/content/cert_report_helper.h"
2420 #include "components/security_interstitials/content/certificate_error_report.h" 2422 #include "components/security_interstitials/content/certificate_error_report.h"
2421 #include "components/variations/variations_associated_data.h" 2423 #include "components/variations/variations_associated_data.h"
2422--- a/chrome/browser/ssl/sct_reporting_service.cc 2424--- chrome/browser/ssl/sct_reporting_service.cc.orig
2423+++ b/chrome/browser/ssl/sct_reporting_service.cc 2425+++ chrome/browser/ssl/sct_reporting_service.cc
2424@@ -12,7 +12,6 @@ 2426@@ -9,7 +9,6 @@
2427 #include "chrome/browser/net/system_network_context_manager.h"
2428 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
2425 #include "chrome/common/chrome_features.h" 2429 #include "chrome/common/chrome_features.h"
2426 #include "chrome/common/pref_names.h"
2427 #include "components/prefs/pref_service.h"
2428-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 2430-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
2429 #include "content/public/browser/network_service_instance.h" 2431 #include "content/public/browser/network_service_instance.h"
2430 #include "content/public/browser/storage_partition.h" 2432 #include "content/public/browser/storage_partition.h"
2431 #include "google_apis/google_api_keys.h" 2433 #include "net/traffic_annotation/network_traffic_annotation.h"
2432@@ -193,18 +192,6 @@ void SetSCTAuditingEnabledForStoragePart 2434@@ -119,8 +118,5 @@ void SCTReportingService::SetReportingEn
2433 } // namespace
2434
2435 network::mojom::SCTAuditingMode SCTReportingService::GetReportingMode() {
2436- if (profile_->IsOffTheRecord() ||
2437- !base::FeatureList::IsEnabled(features::kSCTAuditing)) {
2438- return network::mojom::SCTAuditingMode::kDisabled;
2439- }
2440- if (safe_browsing::IsSafeBrowsingEnabled(pref_service_)) {
2441- if (safe_browsing::IsExtendedReportingEnabled(pref_service_)) {
2442- return network::mojom::SCTAuditingMode::kEnhancedSafeBrowsingReporting;
2443- }
2444- if (base::FeatureList::IsEnabled(features::kSCTAuditingHashdance)) {
2445- return network::mojom::SCTAuditingMode::kHashdance;
2446- }
2447- }
2448 return network::mojom::SCTAuditingMode::kDisabled;
2449 } 2435 }
2450 2436
2451--- a/chrome/browser/ssl/ssl_browsertest.cc 2437 void SCTReportingService::OnPreferenceChanged() {
2452+++ b/chrome/browser/ssl/ssl_browsertest.cc 2438- const bool enabled = safe_browsing_service_ &&
2453@@ -93,7 +93,6 @@ 2439- safe_browsing_service_->enabled_by_prefs() &&
2440- safe_browsing::IsExtendedReportingEnabled(pref_service_);
2441- SetReportingEnabled(enabled);
2442+ SetReportingEnabled(false);
2443 }
2444--- chrome/browser/ssl/ssl_browsertest.cc.orig
2445+++ chrome/browser/ssl/ssl_browsertest.cc
2446@@ -94,7 +94,6 @@
2454 #include "components/policy/policy_constants.h" 2447 #include "components/policy/policy_constants.h"
2455 #include "components/prefs/testing_pref_service.h" 2448 #include "components/prefs/testing_pref_service.h"
2456 #include "components/safe_browsing/core/common/features.h" 2449 #include "components/safe_browsing/core/common/features.h"
@@ -2458,8 +2451,8 @@
2458 #include "components/security_interstitials/content/bad_clock_blocking_page.h" 2451 #include "components/security_interstitials/content/bad_clock_blocking_page.h"
2459 #include "components/security_interstitials/content/captive_portal_blocking_page.h" 2452 #include "components/security_interstitials/content/captive_portal_blocking_page.h"
2460 #include "components/security_interstitials/content/cert_report_helper.h" 2453 #include "components/security_interstitials/content/cert_report_helper.h"
2461--- a/chrome/browser/ssl/ssl_error_controller_client.cc 2454--- chrome/browser/ssl/ssl_error_controller_client.cc.orig
2462+++ b/chrome/browser/ssl/ssl_error_controller_client.cc 2455+++ chrome/browser/ssl/ssl_error_controller_client.cc
2463@@ -23,7 +23,6 @@ 2456@@ -23,7 +23,6 @@
2464 #include "chrome/browser/ssl/stateful_ssl_host_state_delegate_factory.h" 2457 #include "chrome/browser/ssl/stateful_ssl_host_state_delegate_factory.h"
2465 #include "chrome/common/pref_names.h" 2458 #include "chrome/common/pref_names.h"
@@ -2468,8 +2461,8 @@
2468 #include "components/security_interstitials/content/content_metrics_helper.h" 2461 #include "components/security_interstitials/content/content_metrics_helper.h"
2469 #include "components/security_interstitials/content/settings_page_helper.h" 2462 #include "components/security_interstitials/content/settings_page_helper.h"
2470 #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" 2463 #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
2471--- a/chrome/browser/supervised_user/supervised_user_pref_store.cc 2464--- chrome/browser/supervised_user/supervised_user_pref_store.cc.orig
2472+++ b/chrome/browser/supervised_user/supervised_user_pref_store.cc 2465+++ chrome/browser/supervised_user/supervised_user_pref_store.cc
2473@@ -23,7 +23,6 @@ 2466@@ -23,7 +23,6 @@
2474 #include "chrome/common/pref_names.h" 2467 #include "chrome/common/pref_names.h"
2475 #include "components/feed/core/shared_prefs/pref_names.h" 2468 #include "components/feed/core/shared_prefs/pref_names.h"
@@ -2497,8 +2490,8 @@
2497 prefs_->SetBoolean(feed::prefs::kEnableSnippets, false); 2490 prefs_->SetBoolean(feed::prefs::kEnableSnippets, false);
2498 2491
2499 // Copy supervised user settings to prefs. 2492 // Copy supervised user settings to prefs.
2500--- a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc 2493--- chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc.orig
2501+++ b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc 2494+++ chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
2502@@ -37,7 +37,6 @@ 2495@@ -37,7 +37,6 @@
2503 #include "components/autofill/core/common/autofill_features.h" 2496 #include "components/autofill/core/common/autofill_features.h"
2504 #include "components/autofill/core/common/autofill_payments_features.h" 2497 #include "components/autofill/core/common/autofill_payments_features.h"
@@ -2507,9 +2500,9 @@
2507 #include "components/signin/public/identity_manager/identity_manager.h" 2500 #include "components/signin/public/identity_manager/identity_manager.h"
2508 #include "components/strings/grit/components_strings.h" 2501 #include "components/strings/grit/components_strings.h"
2509 #include "components/sync/driver/sync_service.h" 2502 #include "components/sync/driver/sync_service.h"
2510--- a/chrome/browser/ui/browser_command_controller.cc 2503--- chrome/browser/ui/browser_command_controller.cc.orig
2511+++ b/chrome/browser/ui/browser_command_controller.cc 2504+++ chrome/browser/ui/browser_command_controller.cc
2512@@ -56,7 +56,6 @@ 2505@@ -57,7 +57,6 @@
2513 #include "components/prefs/pref_service.h" 2506 #include "components/prefs/pref_service.h"
2514 #include "components/sessions/core/tab_restore_service.h" 2507 #include "components/sessions/core/tab_restore_service.h"
2515 #include "components/signin/public/base/signin_buildflags.h" 2508 #include "components/signin/public/base/signin_buildflags.h"
@@ -2517,7 +2510,7 @@
2517 #include "content/public/browser/native_web_keyboard_event.h" 2510 #include "content/public/browser/native_web_keyboard_event.h"
2518 #include "content/public/browser/navigation_controller.h" 2511 #include "content/public/browser/navigation_controller.h"
2519 #include "content/public/browser/navigation_entry.h" 2512 #include "content/public/browser/navigation_entry.h"
2520@@ -204,10 +203,6 @@ BrowserCommandController::BrowserCommand 2513@@ -184,10 +183,6 @@ BrowserCommandController::BrowserCommand
2521 &BrowserCommandController::UpdateCommandsForFullscreenMode, 2514 &BrowserCommandController::UpdateCommandsForFullscreenMode,
2522 base::Unretained(this))); 2515 base::Unretained(this)));
2523 #endif 2516 #endif
@@ -2528,7 +2521,7 @@
2528 2521
2529 InitCommandState(); 2522 InitCommandState();
2530 2523
2531@@ -1556,7 +1551,7 @@ void BrowserCommandController::UpdateSho 2524@@ -1526,7 +1521,7 @@ void BrowserCommandController::UpdateSho
2532 return; 2525 return;
2533 2526
2534 command_updater_.UpdateCommandEnabled( 2527 command_updater_.UpdateCommandEnabled(
@@ -2536,10 +2529,10 @@
2536+ IDC_SHOW_SIGNIN, false); 2529+ IDC_SHOW_SIGNIN, false);
2537 } 2530 }
2538 2531
2539 void BrowserCommandController::UpdateReloadStopState(bool is_loading, 2532 // static
2540--- a/chrome/browser/ui/browser_command_controller.h 2533--- chrome/browser/ui/browser_command_controller.h.orig
2541+++ b/chrome/browser/ui/browser_command_controller.h 2534+++ chrome/browser/ui/browser_command_controller.h
2542@@ -212,7 +212,6 @@ class BrowserCommandController : public 2535@@ -211,7 +211,6 @@ class BrowserCommandController : public
2543 2536
2544 PrefChangeRegistrar profile_pref_registrar_; 2537 PrefChangeRegistrar profile_pref_registrar_;
2545 PrefChangeRegistrar local_pref_registrar_; 2538 PrefChangeRegistrar local_pref_registrar_;
@@ -2547,9 +2540,9 @@
2547 2540
2548 // In locked fullscreen mode disallow enabling/disabling commands. 2541 // In locked fullscreen mode disallow enabling/disabling commands.
2549 bool is_locked_fullscreen_ = false; 2542 bool is_locked_fullscreen_ = false;
2550--- a/chrome/browser/ui/browser_command_controller_unittest.cc 2543--- chrome/browser/ui/browser_command_controller_unittest.cc.orig
2551+++ b/chrome/browser/ui/browser_command_controller_unittest.cc 2544+++ chrome/browser/ui/browser_command_controller_unittest.cc
2552@@ -28,7 +28,6 @@ 2545@@ -27,7 +27,6 @@
2553 #include "chrome/test/base/test_browser_window.h" 2546 #include "chrome/test/base/test_browser_window.h"
2554 #include "chrome/test/base/testing_browser_process.h" 2547 #include "chrome/test/base/testing_browser_process.h"
2555 #include "chrome/test/base/testing_profile_manager.h" 2548 #include "chrome/test/base/testing_profile_manager.h"
@@ -2557,17 +2550,17 @@
2557 #include "content/public/browser/native_web_keyboard_event.h" 2550 #include "content/public/browser/native_web_keyboard_event.h"
2558 #include "ui/events/keycodes/dom/dom_code.h" 2551 #include "ui/events/keycodes/dom/dom_code.h"
2559 #include "ui/events/keycodes/keyboard_codes.h" 2552 #include "ui/events/keycodes/keyboard_codes.h"
2560--- a/chrome/browser/ui/chrome_pages.cc 2553--- chrome/browser/ui/chrome_pages.cc.orig
2561+++ b/chrome/browser/ui/chrome_pages.cc 2554+++ chrome/browser/ui/chrome_pages.cc
2562@@ -64,7 +64,6 @@ 2555@@ -61,7 +61,6 @@
2563 #if !BUILDFLAG(IS_ANDROID) 2556
2564 #include "base/metrics/histogram_functions.h" 2557 #if !defined(OS_ANDROID)
2565 #include "chrome/browser/signin/identity_manager_factory.h" 2558 #include "chrome/browser/signin/identity_manager_factory.h"
2566-#include "components/signin/public/base/signin_pref_names.h" 2559-#include "components/signin/public/base/signin_pref_names.h"
2567 #include "components/signin/public/identity_manager/identity_manager.h" 2560 #include "components/signin/public/identity_manager/identity_manager.h"
2568 #endif 2561 #endif
2569 2562
2570@@ -513,13 +512,7 @@ void ShowBrowserSignin(Browser* browser, 2563@@ -484,13 +483,7 @@ void ShowBrowserSignin(Browser* browser,
2571 2564
2572 void ShowBrowserSigninOrSettings(Browser* browser, 2565 void ShowBrowserSigninOrSettings(Browser* browser,
2573 signin_metrics::AccessPoint access_point) { 2566 signin_metrics::AccessPoint access_point) {
@@ -2582,8 +2575,8 @@
2582 } 2575 }
2583 #endif 2576 #endif
2584 2577
2585--- a/chrome/browser/ui/hats/trust_safety_sentiment_service.cc 2578--- chrome/browser/ui/hats/trust_safety_sentiment_service.cc.orig
2586+++ b/chrome/browser/ui/hats/trust_safety_sentiment_service.cc 2579+++ chrome/browser/ui/hats/trust_safety_sentiment_service.cc
2587@@ -19,8 +19,6 @@ 2580@@ -19,8 +19,6 @@
2588 #include "components/content_settings/core/common/pref_names.h" 2581 #include "components/content_settings/core/common/pref_names.h"
2589 #include "components/password_manager/core/common/password_manager_pref_names.h" 2582 #include "components/password_manager/core/common/password_manager_pref_names.h"
@@ -2593,7 +2586,7 @@
2593 #include "components/unified_consent/pref_names.h" 2586 #include "components/unified_consent/pref_names.h"
2594 2587
2595 namespace { 2588 namespace {
2596@@ -124,9 +122,6 @@ bool HasNonDefaultPrivacySetting(Profile 2589@@ -81,9 +79,6 @@ bool HasNonDefaultPrivacySetting(Profile
2597 auto* prefs = profile->GetPrefs(); 2590 auto* prefs = profile->GetPrefs();
2598 2591
2599 std::vector<std::string> prefs_to_check = { 2592 std::vector<std::string> prefs_to_check = {
@@ -2603,7 +2596,7 @@
2603 prefs::kEnableDoNotTrack, 2596 prefs::kEnableDoNotTrack,
2604 password_manager::prefs::kPasswordLeakDetectionEnabled, 2597 password_manager::prefs::kPasswordLeakDetectionEnabled,
2605 prefs::kCookieControlsMode, 2598 prefs::kCookieControlsMode,
2606@@ -144,13 +139,9 @@ bool HasNonDefaultPrivacySetting(Profile 2599@@ -101,13 +96,9 @@ bool HasNonDefaultPrivacySetting(Profile
2607 // Users consenting to sync automatically enable UKM collection 2600 // Users consenting to sync automatically enable UKM collection
2608 auto* ukm_pref = prefs->FindPreference( 2601 auto* ukm_pref = prefs->FindPreference(
2609 unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled); 2602 unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled);
@@ -2618,9 +2611,9 @@
2618 2611
2619 // Check the default value for each user facing content setting. Note that 2612 // Check the default value for each user facing content setting. Note that
2620 // this will not include content setting exceptions set via permission 2613 // this will not include content setting exceptions set via permission
2621--- a/chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc 2614--- chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc.orig
2622+++ b/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
2623@@ -19,7 +19,6 @@ 2616@@ -20,7 +20,6 @@
2624 #include "components/password_manager/core/browser/password_manager_metrics_util.h" 2617 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
2625 #include "components/safe_browsing/content/browser/password_protection/password_protection_test_util.h" 2618 #include "components/safe_browsing/content/browser/password_protection/password_protection_test_util.h"
2626 #include "components/safe_browsing/core/browser/password_protection/metrics_util.h" 2619 #include "components/safe_browsing/core/browser/password_protection/metrics_util.h"
@@ -2628,17 +2621,17 @@
2628 #include "components/signin/public/identity_manager/account_info.h" 2621 #include "components/signin/public/identity_manager/account_info.h"
2629 #include "components/signin/public/identity_manager/identity_manager.h" 2622 #include "components/signin/public/identity_manager/identity_manager.h"
2630 #include "components/signin/public/identity_manager/identity_test_utils.h" 2623 #include "components/signin/public/identity_manager/identity_test_utils.h"
2631--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc 2624--- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig
2632+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc 2625+++ chrome/browser/ui/views/profiles/profile_menu_view.cc
2633@@ -53,7 +53,6 @@ 2626@@ -53,7 +53,6 @@
2627 #include "chrome/grit/generated_resources.h"
2634 #include "chrome/grit/theme_resources.h" 2628 #include "chrome/grit/theme_resources.h"
2635 #include "components/signin/core/browser/signin_error_controller.h" 2629 #include "components/signin/core/browser/signin_error_controller.h"
2636 #include "components/signin/public/base/consent_level.h"
2637-#include "components/signin/public/base/signin_pref_names.h" 2630-#include "components/signin/public/base/signin_pref_names.h"
2631 #include "components/signin/public/identity_manager/consent_level.h"
2638 #include "components/signin/public/identity_manager/primary_account_mutator.h" 2632 #include "components/signin/public/identity_manager/primary_account_mutator.h"
2639 #include "components/strings/grit/components_strings.h" 2633 #include "components/strings/grit/components_strings.h"
2640 #include "components/vector_icons/vector_icons.h" 2634@@ -501,7 +500,6 @@ void ProfileMenuView::BuildAutofillButto
2641@@ -507,7 +506,6 @@ void ProfileMenuView::BuildAutofillButto
2642 2635
2643 void ProfileMenuView::BuildSyncInfo() { 2636 void ProfileMenuView::BuildSyncInfo() {
2644 Profile* profile = browser()->profile(); 2637 Profile* profile = browser()->profile();
@@ -2646,18 +2639,18 @@
2646 return; 2639 return;
2647 2640
2648 signin::IdentityManager* identity_manager = 2641 signin::IdentityManager* identity_manager =
2649--- a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc 2642--- chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc.orig
2650+++ b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc 2643+++ chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
2651@@ -60,7 +60,6 @@ 2644@@ -55,7 +55,6 @@
2652 #include "components/google/core/common/google_util.h" 2645 #include "components/feature_engagement/public/tracker.h"
2646 #include "components/feature_engagement/test/test_tracker.h"
2653 #include "components/prefs/pref_service.h" 2647 #include "components/prefs/pref_service.h"
2654 #include "components/signin/public/base/consent_level.h"
2655-#include "components/signin/public/base/signin_pref_names.h" 2648-#include "components/signin/public/base/signin_pref_names.h"
2649 #include "components/signin/public/identity_manager/consent_level.h"
2656 #include "components/signin/public/identity_manager/identity_test_utils.h" 2650 #include "components/signin/public/identity_manager/identity_test_utils.h"
2657 #include "components/sync/driver/sync_service.h" 2651 #include "components/sync/driver/sync_service.h"
2658 #include "components/sync/driver/sync_user_settings.h" 2652--- chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc.orig
2659--- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc 2653+++ chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
2660+++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
2661@@ -122,7 +122,6 @@ PasswordReuseModalWarningDialog::Passwor 2654@@ -122,7 +122,6 @@ PasswordReuseModalWarningDialog::Passwor
2662 OnWarningDone done_callback) 2655 OnWarningDone done_callback)
2663 : content::WebContentsObserver(web_contents), 2656 : content::WebContentsObserver(web_contents),
@@ -2699,19 +2692,19 @@
2699 LogModalWarningDialogLifetime(modal_construction_start_time_); 2692 LogModalWarningDialogLifetime(modal_construction_start_time_);
2700 } 2693 }
2701 2694
2702--- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h 2695--- chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h.orig
2703+++ b/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
2704@@ -61,7 +61,6 @@ class PasswordReuseModalWarningDialog 2697@@ -60,7 +60,6 @@ class PasswordReuseModalWarningDialog
2705 2698
2706 private: 2699 private:
2707 OnWarningDone done_callback_; 2700 OnWarningDone done_callback_;
2708- raw_ptr<ChromePasswordProtectionService> service_; 2701- ChromePasswordProtectionService* service_;
2709 const GURL url_; 2702 const GURL url_;
2710 const ReusedPasswordAccountType password_type_; 2703 const ReusedPasswordAccountType password_type_;
2711 2704
2712--- a/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc 2705--- chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc.orig
2713+++ b/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc 2706+++ chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc
2714@@ -46,7 +46,6 @@ 2707@@ -44,7 +44,6 @@
2715 #include "components/keyed_service/content/browser_context_dependency_manager.h" 2708 #include "components/keyed_service/content/browser_context_dependency_manager.h"
2716 #include "components/prefs/pref_service.h" 2709 #include "components/prefs/pref_service.h"
2717 #include "components/prefs/scoped_user_pref_update.h" 2710 #include "components/prefs/scoped_user_pref_update.h"
@@ -2719,9 +2712,9 @@
2719 #include "components/signin/public/identity_manager/identity_test_utils.h" 2712 #include "components/signin/public/identity_manager/identity_test_utils.h"
2720 #include "content/public/browser/render_frame_host.h" 2713 #include "content/public/browser/render_frame_host.h"
2721 #include "content/public/browser/render_process_host.h" 2714 #include "content/public/browser/render_process_host.h"
2722--- a/chrome/browser/ui/webui/browser_command/browser_command_handler.cc 2715--- chrome/browser/ui/webui/browser_command/browser_command_handler.cc.orig
2723+++ b/chrome/browser/ui/webui/browser_command/browser_command_handler.cc 2716+++ chrome/browser/ui/webui/browser_command/browser_command_handler.cc
2724@@ -17,7 +17,6 @@ 2717@@ -16,7 +16,6 @@
2725 #include "chrome/common/webui_url_constants.h" 2718 #include "chrome/common/webui_url_constants.h"
2726 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" 2719 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
2727 #include "components/safe_browsing/core/common/safe_browsing_policy_handler.h" 2720 #include "components/safe_browsing/core/common/safe_browsing_policy_handler.h"
@@ -2730,8 +2723,8 @@
2730 #include "ui/base/window_open_disposition.h" 2723 #include "ui/base/window_open_disposition.h"
2731 2724
2732@@ -61,13 +60,6 @@ void BrowserCommandHandler::CanExecuteCo 2725@@ -61,13 +60,6 @@ void BrowserCommandHandler::CanExecuteCo
2733 case Command::kOpenSafetyCheck: 2726 can_execute =
2734 can_execute = !chrome::enterprise_util::IsBrowserManaged(profile_); 2727 !chrome::enterprise_util::HasBrowserPoliciesApplied(profile_);
2735 break; 2728 break;
2736- case Command::kOpenSafeBrowsingEnhancedProtectionSettings: { 2729- case Command::kOpenSafeBrowsingEnhancedProtectionSettings: {
2737- bool managed = safe_browsing::SafeBrowsingPolicyHandler:: 2730- bool managed = safe_browsing::SafeBrowsingPolicyHandler::
@@ -2743,8 +2736,8 @@
2743 case Command::kOpenFeedbackForm: 2736 case Command::kOpenFeedbackForm:
2744 can_execute = true; 2737 can_execute = true;
2745 break; 2738 break;
2746--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc 2739--- chrome/browser/ui/webui/downloads/downloads_dom_handler.cc.orig
2747+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc 2740+++ chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
2748@@ -37,7 +37,6 @@ 2741@@ -37,7 +37,6 @@
2749 #include "chrome/common/url_constants.h" 2742 #include "chrome/common/url_constants.h"
2750 #include "components/download/public/common/download_item.h" 2743 #include "components/download/public/common/download_item.h"
@@ -2753,27 +2746,8 @@
2753 #include "content/public/browser/browser_thread.h" 2746 #include "content/public/browser/browser_thread.h"
2754 #include "content/public/browser/download_manager.h" 2747 #include "content/public/browser/download_manager.h"
2755 #include "content/public/browser/render_process_host.h" 2748 #include "content/public/browser/render_process_host.h"
2756--- a/chrome/browser/ui/webui/history/history_ui.cc 2749--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig
2757+++ b/chrome/browser/ui/webui/history/history_ui.cc 2750+++ chrome/browser/ui/webui/management/management_ui_handler.cc
2758@@ -40,7 +40,6 @@
2759 #include "components/history_clusters/core/history_clusters_prefs.h"
2760 #include "components/history_clusters/core/history_clusters_service.h"
2761 #include "components/prefs/pref_service.h"
2762-#include "components/signin/public/base/signin_pref_names.h"
2763 #include "components/signin/public/identity_manager/identity_manager.h"
2764 #include "components/strings/grit/components_strings.h"
2765 #include "content/public/browser/web_ui.h"
2766@@ -123,8 +122,6 @@ content::WebUIDataSource* CreateHistoryU
2767 source->AddBoolean("allowDeletingHistory", allow_deleting_history);
2768
2769 source->AddBoolean("isGuestSession", profile->IsGuestSession());
2770- source->AddBoolean("isSignInAllowed",
2771- prefs->GetBoolean(prefs::kSigninAllowed));
2772
2773 source->AddBoolean(kIsUserSignedInKey, IsUserSignedIn(profile));
2774
2775--- a/chrome/browser/ui/webui/management/management_ui_handler.cc
2776+++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
2777@@ -29,7 +29,6 @@ 2751@@ -29,7 +29,6 @@
2778 #include "chrome/browser/profiles/profile.h" 2752 #include "chrome/browser/profiles/profile.h"
2779 #include "chrome/browser/ui/managed_ui.h" 2753 #include "chrome/browser/ui/managed_ui.h"
@@ -2782,8 +2756,8 @@
2782 #include "components/strings/grit/components_strings.h" 2756 #include "components/strings/grit/components_strings.h"
2783 #include "content/public/browser/storage_partition.h" 2757 #include "content/public/browser/storage_partition.h"
2784 #include "content/public/browser/web_contents.h" 2758 #include "content/public/browser/web_contents.h"
2785--- a/chrome/browser/ui/webui/profile_info_watcher.cc 2759--- chrome/browser/ui/webui/profile_info_watcher.cc.orig
2786+++ b/chrome/browser/ui/webui/profile_info_watcher.cc 2760+++ chrome/browser/ui/webui/profile_info_watcher.cc
2787@@ -12,7 +12,6 @@ 2761@@ -12,7 +12,6 @@
2788 #include "chrome/browser/signin/identity_manager_factory.h" 2762 #include "chrome/browser/signin/identity_manager_factory.h"
2789 #include "chrome/common/pref_names.h" 2763 #include "chrome/common/pref_names.h"
@@ -2804,8 +2778,8 @@
2804 } 2778 }
2805 2779
2806 ProfileInfoWatcher::~ProfileInfoWatcher() { 2780 ProfileInfoWatcher::~ProfileInfoWatcher() {
2807--- a/chrome/browser/ui/webui/profile_info_watcher.h 2781--- chrome/browser/ui/webui/profile_info_watcher.h.orig
2808+++ b/chrome/browser/ui/webui/profile_info_watcher.h 2782+++ chrome/browser/ui/webui/profile_info_watcher.h
2809@@ -49,7 +49,6 @@ class ProfileInfoWatcher : public Profil 2783@@ -49,7 +49,6 @@ class ProfileInfoWatcher : public Profil
2810 // Called when the authenticated username changes. 2784 // Called when the authenticated username changes.
2811 base::RepeatingClosure callback_; 2785 base::RepeatingClosure callback_;
@@ -2814,9 +2788,9 @@
2814 }; 2788 };
2815 2789
2816 #endif // CHROME_BROWSER_UI_WEBUI_PROFILE_INFO_WATCHER_H_ 2790 #endif // CHROME_BROWSER_UI_WEBUI_PROFILE_INFO_WATCHER_H_
2817--- a/chrome/browser/ui/webui/reset_password/reset_password_ui.cc 2791--- chrome/browser/ui/webui/reset_password/reset_password_ui.cc.orig
2818+++ b/chrome/browser/ui/webui/reset_password/reset_password_ui.cc 2792+++ chrome/browser/ui/webui/reset_password/reset_password_ui.cc
2819@@ -18,7 +18,6 @@ 2793@@ -17,7 +17,6 @@
2820 #include "components/safe_browsing/content/browser/password_protection/password_protection_service.h" 2794 #include "components/safe_browsing/content/browser/password_protection/password_protection_service.h"
2821 #include "components/safe_browsing/core/browser/password_protection/metrics_util.h" 2795 #include "components/safe_browsing/core/browser/password_protection/metrics_util.h"
2822 #include "components/safe_browsing/core/common/proto/csd.pb.h" 2796 #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -2824,17 +2798,17 @@
2824 #include "components/strings/grit/components_strings.h" 2798 #include "components/strings/grit/components_strings.h"
2825 #include "components/url_formatter/url_formatter.h" 2799 #include "components/url_formatter/url_formatter.h"
2826 #include "components/user_prefs/user_prefs.h" 2800 #include "components/user_prefs/user_prefs.h"
2827--- a/chrome/browser/ui/webui/settings/people_handler.cc 2801--- chrome/browser/ui/webui/settings/people_handler.cc.orig
2828+++ b/chrome/browser/ui/webui/settings/people_handler.cc 2802+++ chrome/browser/ui/webui/settings/people_handler.cc
2829@@ -42,7 +42,6 @@ 2803@@ -41,7 +41,6 @@
2804 #include "components/prefs/pref_service.h"
2830 #include "components/signin/core/browser/signin_error_controller.h" 2805 #include "components/signin/core/browser/signin_error_controller.h"
2831 #include "components/signin/public/base/consent_level.h"
2832 #include "components/signin/public/base/signin_metrics.h" 2806 #include "components/signin/public/base/signin_metrics.h"
2833-#include "components/signin/public/base/signin_pref_names.h" 2807-#include "components/signin/public/base/signin_pref_names.h"
2834 #include "components/signin/public/identity_manager/accounts_mutator.h" 2808 #include "components/signin/public/identity_manager/accounts_mutator.h"
2809 #include "components/signin/public/identity_manager/consent_level.h"
2835 #include "components/signin/public/identity_manager/identity_manager.h" 2810 #include "components/signin/public/identity_manager/identity_manager.h"
2836 #include "components/signin/public/identity_manager/primary_account_mutator.h" 2811@@ -290,10 +289,6 @@ void PeopleHandler::RegisterMessages() {
2837@@ -299,10 +298,6 @@ void PeopleHandler::RegisterMessages() {
2838 void PeopleHandler::OnJavascriptAllowed() { 2812 void PeopleHandler::OnJavascriptAllowed() {
2839 PrefService* prefs = profile_->GetPrefs(); 2813 PrefService* prefs = profile_->GetPrefs();
2840 profile_pref_registrar_.Init(prefs); 2814 profile_pref_registrar_.Init(prefs);
@@ -2845,8 +2819,8 @@
2845 2819
2846 signin::IdentityManager* identity_manager( 2820 signin::IdentityManager* identity_manager(
2847 IdentityManagerFactory::GetInstance()->GetForProfile(profile_)); 2821 IdentityManagerFactory::GetInstance()->GetForProfile(profile_));
2848--- a/chrome/browser/ui/webui/settings/safety_check_handler.cc 2822--- chrome/browser/ui/webui/settings/safety_check_handler.cc.orig
2849+++ b/chrome/browser/ui/webui/settings/safety_check_handler.cc 2823+++ chrome/browser/ui/webui/settings/safety_check_handler.cc
2850@@ -28,7 +28,6 @@ 2824@@ -28,7 +28,6 @@
2851 #include "chrome/grit/chromium_strings.h" 2825 #include "chrome/grit/chromium_strings.h"
2852 #include "chrome/grit/generated_resources.h" 2826 #include "chrome/grit/generated_resources.h"
@@ -2855,20 +2829,22 @@
2855 #include "components/strings/grit/components_strings.h" 2829 #include "components/strings/grit/components_strings.h"
2856 #include "components/version_info/version_info.h" 2830 #include "components/version_info/version_info.h"
2857 #include "content/public/browser/browser_context.h" 2831 #include "content/public/browser/browser_context.h"
2858--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc 2832--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig
2859+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc 2833+++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
2860@@ -69,7 +69,6 @@ 2834@@ -67,7 +67,6 @@
2835 #include "components/password_manager/core/browser/manage_passwords_referrer.h"
2861 #include "components/password_manager/core/common/password_manager_features.h" 2836 #include "components/password_manager/core/common/password_manager_features.h"
2862 #include "components/prefs/pref_service.h" 2837 #include "components/prefs/pref_service.h"
2863 #include "components/privacy_sandbox/privacy_sandbox_features.h"
2864-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 2838-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
2865 #include "components/signin/public/base/signin_buildflags.h" 2839 #include "components/signin/public/base/signin_buildflags.h"
2866 #include "components/strings/grit/components_chromium_strings.h" 2840 #include "components/strings/grit/components_chromium_strings.h"
2867 #include "components/strings/grit/components_strings.h" 2841 #include "components/strings/grit/components_strings.h"
2868@@ -1445,44 +1444,6 @@ void AddPrivacyStrings(content::WebUIDat 2842@@ -1391,46 +1390,6 @@ void AddPrivacyStrings(content::WebUIDat
2869 {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA}, 2843 {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
2870 {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION}, 2844 {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
2871 {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT}, 2845 {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT},
2846- {"safeBrowsingEnableExtendedReporting",
2847- IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING},
2872- {"safeBrowsingEnableExtendedReportingDesc", 2848- {"safeBrowsingEnableExtendedReportingDesc",
2873- IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC}, 2849- IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC},
2874- {"safeBrowsingEnhanced", IDS_SETTINGS_SAFEBROWSING_ENHANCED}, 2850- {"safeBrowsingEnhanced", IDS_SETTINGS_SAFEBROWSING_ENHANCED},
@@ -2910,7 +2886,7 @@
2910 {"safeBrowsingSectionLabel", IDS_SETTINGS_SAFEBROWSING_SECTION_LABEL}, 2886 {"safeBrowsingSectionLabel", IDS_SETTINGS_SAFEBROWSING_SECTION_LABEL},
2911 {"syncAndGoogleServicesPrivacyDescription", 2887 {"syncAndGoogleServicesPrivacyDescription",
2912 IDS_SETTINGS_SYNC_AND_GOOGLE_SERVICES_PRIVACY_DESC_UNIFIED_CONSENT}, 2888 IDS_SETTINGS_SYNC_AND_GOOGLE_SERVICES_PRIVACY_DESC_UNIFIED_CONSENT},
2913@@ -2779,11 +2740,6 @@ void AddSiteSettingsStrings(content::Web 2889@@ -2626,11 +2585,6 @@ void AddSiteSettingsStrings(content::Web
2914 html_source->AddLocalizedStrings(kSensorsLocalizedStrings); 2890 html_source->AddLocalizedStrings(kSensorsLocalizedStrings);
2915 2891
2916 html_source->AddBoolean( 2892 html_source->AddBoolean(
@@ -2922,9 +2898,9 @@
2922 "enableBlockAutoplayContentSetting", 2898 "enableBlockAutoplayContentSetting",
2923 base::FeatureList::IsEnabled(media::kAutoplayDisableSettings)); 2899 base::FeatureList::IsEnabled(media::kAutoplayDisableSettings));
2924 2900
2925--- a/chrome/browser/ui/webui/settings/settings_ui.cc 2901--- chrome/browser/ui/webui/settings/settings_ui.cc.orig
2926+++ b/chrome/browser/ui/webui/settings/settings_ui.cc 2902+++ chrome/browser/ui/webui/settings/settings_ui.cc
2927@@ -70,7 +70,6 @@ 2903@@ -72,7 +72,6 @@
2928 #include "components/pref_registry/pref_registry_syncable.h" 2904 #include "components/pref_registry/pref_registry_syncable.h"
2929 #include "components/prefs/pref_service.h" 2905 #include "components/prefs/pref_service.h"
2930 #include "components/safe_browsing/core/common/features.h" 2906 #include "components/safe_browsing/core/common/features.h"
@@ -2932,9 +2908,9 @@
2932 #include "content/public/browser/url_data_source.h" 2908 #include "content/public/browser/url_data_source.h"
2933 #include "content/public/browser/web_contents.h" 2909 #include "content/public/browser/web_contents.h"
2934 #include "content/public/browser/web_ui.h" 2910 #include "content/public/browser/web_ui.h"
2935@@ -268,9 +267,7 @@ SettingsUI::SettingsUI(content::WebUI* w 2911@@ -274,9 +273,7 @@ SettingsUI::SettingsUI(content::WebUI* w
2936 html_source->AddString("enableBrandingUpdateAttribute", 2912 ? "enable-branding-update"
2937 "enable-branding-update"); 2913 : "");
2938 2914
2939- html_source->AddBoolean("signinAllowed", !profile->IsGuestSession() && 2915- html_source->AddBoolean("signinAllowed", !profile->IsGuestSession() &&
2940- profile->GetPrefs()->GetBoolean( 2916- profile->GetPrefs()->GetBoolean(
@@ -2943,8 +2919,38 @@
2943 2919
2944 html_source->AddBoolean("showImportPasswords", 2920 html_source->AddBoolean("showImportPasswords",
2945 base::FeatureList::IsEnabled( 2921 base::FeatureList::IsEnabled(
2946--- a/chrome/browser/ui/webui/signin/inline_login_handler.cc 2922--- chrome/browser/ui/webui/signin/dice_turn_sync_on_helper.cc.orig
2947+++ b/chrome/browser/ui/webui/signin/inline_login_handler.cc 2923+++ chrome/browser/ui/webui/signin/dice_turn_sync_on_helper.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
2948@@ -27,7 +27,6 @@ 2954@@ -27,7 +27,6 @@
2949 #include "chrome/common/pref_names.h" 2955 #include "chrome/common/pref_names.h"
2950 #include "components/metrics/metrics_pref_names.h" 2956 #include "components/metrics/metrics_pref_names.h"
@@ -2953,7 +2959,7 @@
2953 #include "content/public/browser/storage_partition.h" 2959 #include "content/public/browser/storage_partition.h"
2954 #include "content/public/browser/web_contents.h" 2960 #include "content/public/browser/web_contents.h"
2955 #include "content/public/browser/web_ui.h" 2961 #include "content/public/browser/web_ui.h"
2956@@ -138,8 +137,6 @@ void InlineLoginHandler::ContinueHandleI 2962@@ -127,8 +126,6 @@ void InlineLoginHandler::ContinueHandleI
2957 std::string default_email; 2963 std::string default_email;
2958 if (reason == signin_metrics::Reason::kSigninPrimaryAccount || 2964 if (reason == signin_metrics::Reason::kSigninPrimaryAccount ||
2959 reason == signin_metrics::Reason::kForcedSigninPrimaryAccount) { 2965 reason == signin_metrics::Reason::kForcedSigninPrimaryAccount) {
@@ -2962,9 +2968,9 @@
2962 } else { 2968 } else {
2963 if (!net::GetValueForKeyInQuery(current_url, "email", &default_email)) 2969 if (!net::GetValueForKeyInQuery(current_url, "email", &default_email))
2964 default_email.clear(); 2970 default_email.clear();
2965--- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc 2971--- chrome/browser/ui/webui/signin/inline_login_handler_impl.cc.orig
2966+++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc 2972+++ chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
2967@@ -67,7 +67,6 @@ 2973@@ -70,7 +70,6 @@
2968 #include "components/prefs/pref_service.h" 2974 #include "components/prefs/pref_service.h"
2969 #include "components/signin/core/browser/about_signin_internals.h" 2975 #include "components/signin/core/browser/about_signin_internals.h"
2970 #include "components/signin/public/base/signin_metrics.h" 2976 #include "components/signin/public/base/signin_metrics.h"
@@ -2972,8 +2978,8 @@
2972 #include "components/signin/public/identity_manager/account_info.h" 2978 #include "components/signin/public/identity_manager/account_info.h"
2973 #include "components/signin/public/identity_manager/accounts_cookie_mutator.h" 2979 #include "components/signin/public/identity_manager/accounts_cookie_mutator.h"
2974 #include "components/signin/public/identity_manager/accounts_mutator.h" 2980 #include "components/signin/public/identity_manager/accounts_mutator.h"
2975--- a/chrome/browser/ui/webui/signin/signin_error_ui.cc 2981--- chrome/browser/ui/webui/signin/signin_error_ui.cc.orig
2976+++ b/chrome/browser/ui/webui/signin/signin_error_ui.cc 2982+++ chrome/browser/ui/webui/signin/signin_error_ui.cc
2977@@ -23,7 +23,6 @@ 2983@@ -23,7 +23,6 @@
2978 #include "chrome/grit/generated_resources.h" 2984 #include "chrome/grit/generated_resources.h"
2979 #include "chrome/grit/signin_resources.h" 2985 #include "chrome/grit/signin_resources.h"
@@ -2993,8 +2999,8 @@
2993 if (allowed_domain.empty()) { 2999 if (allowed_domain.empty()) {
2994 source->AddLocalizedString( 3000 source->AddLocalizedString(
2995 "profileBlockedAddPersonSuggestion", 3001 "profileBlockedAddPersonSuggestion",
2996--- a/chrome/browser/ui/webui/signin/signin_utils_desktop.cc 3002--- chrome/browser/ui/webui/signin/signin_utils_desktop.cc.orig
2997+++ b/chrome/browser/ui/webui/signin/signin_utils_desktop.cc 3003+++ chrome/browser/ui/webui/signin/signin_utils_desktop.cc
2998@@ -18,7 +18,6 @@ 3004@@ -18,7 +18,6 @@
2999 #include "chrome/grit/chromium_strings.h" 3005 #include "chrome/grit/chromium_strings.h"
3000 #include "chrome/grit/generated_resources.h" 3006 #include "chrome/grit/generated_resources.h"
@@ -3022,38 +3028,8 @@
3022 return SigninUIError::ProfileWasUsedByAnotherAccount(email, last_email); 3028 return SigninUIError::ProfileWasUsedByAnotherAccount(email, last_email);
3023 } 3029 }
3024 } 3030 }
3025--- a/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc 3031--- chrome/browser/ui/webui/welcome/welcome_ui.cc.orig
3026+++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc 3032+++ chrome/browser/ui/webui/welcome/welcome_ui.cc
3027@@ -45,7 +45,6 @@
3028 #include "components/policy/core/common/management/management_service.h"
3029 #include "components/prefs/pref_service.h"
3030 #include "components/signin/public/base/signin_metrics.h"
3031-#include "components/signin/public/base/signin_pref_names.h"
3032 #include "components/signin/public/identity_manager/accounts_mutator.h"
3033 #include "components/signin/public/identity_manager/identity_manager.h"
3034 #include "components/signin/public/identity_manager/primary_account_mutator.h"
3035@@ -220,8 +219,7 @@ TurnSyncOnHelper::TurnSyncOnHelper(
3036 // last authenticated account of the current profile, then Chrome will show a
3037 // confirmation dialog before starting sync.
3038 // TODO(skym): Warn for high risk upgrade scenario (https://crbug.com/572754).
3039- std::string last_email =
3040- profile_->GetPrefs()->GetString(prefs::kGoogleServicesLastUsername);
3041+ std::string last_email;
3042 delegate_->ShowMergeSyncDataConfirmation(
3043 last_email, account_info_.email,
3044 base::BindOnce(&TurnSyncOnHelper::OnMergeAccountConfirmation,
3045--- a/chrome/browser/ui/webui/signin/turn_sync_on_helper_unittest.cc
3046+++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper_unittest.cc
3047@@ -41,7 +41,6 @@
3048 #include "components/prefs/pref_service.h"
3049 #include "components/signin/public/base/account_consistency_method.h"
3050 #include "components/signin/public/base/signin_metrics.h"
3051-#include "components/signin/public/base/signin_pref_names.h"
3052 #include "components/signin/public/identity_manager/identity_manager.h"
3053 #include "components/signin/public/identity_manager/identity_test_environment.h"
3054 #include "components/signin/public/identity_manager/primary_account_mutator.h"
3055--- a/chrome/browser/ui/webui/welcome/welcome_ui.cc
3056+++ b/chrome/browser/ui/webui/welcome/welcome_ui.cc
3057@@ -24,7 +24,6 @@ 3033@@ -24,7 +24,6 @@
3058 #include "chrome/grit/welcome_resources.h" 3034 #include "chrome/grit/welcome_resources.h"
3059 #include "chrome/grit/welcome_resources_map.h" 3035 #include "chrome/grit/welcome_resources_map.h"
@@ -3071,8 +3047,8 @@
3071 html_source->SetRequestFilter( 3047 html_source->SetRequestFilter(
3072 base::BindRepeating(&ShouldHandleRequestCallback, 3048 base::BindRepeating(&ShouldHandleRequestCallback,
3073 weak_ptr_factory_.GetWeakPtr()), 3049 weak_ptr_factory_.GetWeakPtr()),
3074--- a/chrome/browser/unified_consent/unified_consent_service_factory.cc 3050--- chrome/browser/unified_consent/unified_consent_service_factory.cc.orig
3075+++ b/chrome/browser/unified_consent/unified_consent_service_factory.cc 3051+++ chrome/browser/unified_consent/unified_consent_service_factory.cc
3076@@ -13,7 +13,6 @@ 3052@@ -13,7 +13,6 @@
3077 #include "components/embedder_support/pref_names.h" 3053 #include "components/embedder_support/pref_names.h"
3078 #include "components/keyed_service/content/browser_context_dependency_manager.h" 3054 #include "components/keyed_service/content/browser_context_dependency_manager.h"
@@ -3087,10 +3063,10 @@
3087 prefs::kSearchSuggestEnabled, embedder_support::kAlternateErrorPagesEnabled, 3063 prefs::kSearchSuggestEnabled, embedder_support::kAlternateErrorPagesEnabled,
3088- prefs::kSafeBrowsingEnabled, prefs::kSafeBrowsingScoutReportingEnabled, 3064- prefs::kSafeBrowsingEnabled, prefs::kSafeBrowsingScoutReportingEnabled,
3089 spellcheck::prefs::kSpellCheckUseSpellingService, 3065 spellcheck::prefs::kSpellCheckUseSpellingService,
3090 #if BUILDFLAG(IS_ANDROID) 3066 #if defined(OS_ANDROID)
3091 prefs::kContextualSearchEnabled 3067 prefs::kContextualSearchEnabled
3092--- a/chrome/common/extensions/api/privacy.json 3068--- chrome/common/extensions/api/privacy.json.orig
3093+++ b/chrome/common/extensions/api/privacy.json 3069+++ chrome/common/extensions/api/privacy.json
3094@@ -63,16 +63,6 @@ 3070@@ -63,16 +63,6 @@
3095 "value": ["passwordSavingEnabled", {"type":"boolean"}], 3071 "value": ["passwordSavingEnabled", {"type":"boolean"}],
3096 "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>." 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>."
@@ -3108,9 +3084,9 @@
3108 "searchSuggestEnabled": { 3084 "searchSuggestEnabled": {
3109 "$ref": "types.ChromeSetting", 3085 "$ref": "types.ChromeSetting",
3110 "value": ["searchSuggestEnabled", {"type":"boolean"}], 3086 "value": ["searchSuggestEnabled", {"type":"boolean"}],
3111--- a/components/password_manager/core/browser/leak_detection_delegate.cc 3087--- components/password_manager/core/browser/leak_detection_delegate.cc.orig
3112+++ b/components/password_manager/core/browser/leak_detection_delegate.cc 3088+++ components/password_manager/core/browser/leak_detection_delegate.cc
3113@@ -23,7 +23,6 @@ 3089@@ -22,7 +22,6 @@
3114 #include "components/password_manager/core/common/password_manager_features.h" 3090 #include "components/password_manager/core/common/password_manager_features.h"
3115 #include "components/password_manager/core/common/password_manager_pref_names.h" 3091 #include "components/password_manager/core/common/password_manager_pref_names.h"
3116 #include "components/prefs/pref_service.h" 3092 #include "components/prefs/pref_service.h"
@@ -3118,7 +3094,7 @@
3118 #include "services/network/public/cpp/shared_url_loader_factory.h" 3094 #include "services/network/public/cpp/shared_url_loader_factory.h"
3119 3095
3120 namespace password_manager { 3096 namespace password_manager {
3121@@ -176,28 +175,7 @@ void LeakDetectionDelegate::OnError(Leak 3097@@ -169,28 +168,7 @@ void LeakDetectionDelegate::OnError(Leak
3122 3098
3123 bool CanStartLeakCheck(const PrefService& prefs, 3099 bool CanStartLeakCheck(const PrefService& prefs,
3124 const PasswordManagerClient* client) { 3100 const PasswordManagerClient* client) {
@@ -3148,8 +3124,8 @@
3148 } 3124 }
3149 3125
3150 } // namespace password_manager 3126 } // namespace password_manager
3151--- a/components/password_manager/core/browser/password_bubble_experiment.cc 3127--- components/password_manager/core/browser/password_bubble_experiment.cc.orig
3152+++ b/components/password_manager/core/browser/password_bubble_experiment.cc 3128+++ components/password_manager/core/browser/password_bubble_experiment.cc
3153@@ -18,7 +18,6 @@ 3129@@ -18,7 +18,6 @@
3154 #include "components/prefs/pref_registry_simple.h" 3130 #include "components/prefs/pref_registry_simple.h"
3155 #include "components/prefs/pref_service.h" 3131 #include "components/prefs/pref_service.h"
@@ -3158,8 +3134,8 @@
3158 #include "components/sync/driver/sync_service.h" 3134 #include "components/sync/driver/sync_service.h"
3159 #include "components/sync/driver/sync_user_settings.h" 3135 #include "components/sync/driver/sync_user_settings.h"
3160 3136
3161--- a/components/password_manager/core/browser/password_reuse_detector.cc 3137--- components/password_manager/core/browser/password_reuse_detector.cc.orig
3162+++ b/components/password_manager/core/browser/password_reuse_detector.cc 3138+++ components/password_manager/core/browser/password_reuse_detector.cc
3163@@ -15,7 +15,6 @@ 3139@@ -15,7 +15,6 @@
3164 #include "components/password_manager/core/browser/password_reuse_detector_consumer.h" 3140 #include "components/password_manager/core/browser/password_reuse_detector_consumer.h"
3165 #include "components/password_manager/core/browser/password_store_consumer.h" 3141 #include "components/password_manager/core/browser/password_store_consumer.h"
@@ -3168,7 +3144,7 @@
3168 #include "google_apis/gaia/gaia_auth_util.h" 3144 #include "google_apis/gaia/gaia_auth_util.h"
3169 #include "google_apis/gaia/gaia_urls.h" 3145 #include "google_apis/gaia/gaia_urls.h"
3170 #include "url/origin.h" 3146 #include "url/origin.h"
3171@@ -216,9 +215,7 @@ PasswordReuseDetector::CheckNonGaiaEnter 3147@@ -205,9 +204,7 @@ PasswordReuseDetector::CheckNonGaiaEnter
3172 // Skips password reuse check if |domain| matches enterprise login URL or 3148 // Skips password reuse check if |domain| matches enterprise login URL or
3173 // enterprise change password URL. 3149 // enterprise change password URL.
3174 GURL page_url(domain); 3150 GURL page_url(domain);
@@ -3179,8 +3155,8 @@
3179 return absl::nullopt; 3155 return absl::nullopt;
3180 } 3156 }
3181 3157
3182--- a/components/password_manager/core/browser/password_reuse_manager_impl.cc 3158--- components/password_manager/core/browser/password_reuse_manager_impl.cc.orig
3183+++ b/components/password_manager/core/browser/password_reuse_manager_impl.cc 3159+++ components/password_manager/core/browser/password_reuse_manager_impl.cc
3184@@ -9,7 +9,6 @@ 3160@@ -9,7 +9,6 @@
3185 #include "components/password_manager/core/browser/password_store_signin_notifier.h" 3161 #include "components/password_manager/core/browser/password_store_signin_notifier.h"
3186 #include "components/password_manager/core/common/password_manager_features.h" 3162 #include "components/password_manager/core/common/password_manager_features.h"
@@ -3189,7 +3165,7 @@
3189 3165
3190 namespace password_manager { 3166 namespace password_manager {
3191 3167
3192@@ -320,20 +319,6 @@ void PasswordReuseManagerImpl::ScheduleP 3168@@ -318,20 +317,6 @@ void PasswordReuseManagerImpl::ScheduleP
3193 3169
3194 void PasswordReuseManagerImpl::ScheduleEnterprisePasswordURLUpdate() { 3170 void PasswordReuseManagerImpl::ScheduleEnterprisePasswordURLUpdate() {
3195 DCHECK(main_task_runner_->RunsTasksInCurrentSequence()); 3171 DCHECK(main_task_runner_->RunsTasksInCurrentSequence());
@@ -3210,9 +3186,9 @@
3210 } 3186 }
3211 3187
3212 void PasswordReuseManagerImpl::OnGetPasswordStoreResults( 3188 void PasswordReuseManagerImpl::OnGetPasswordStoreResults(
3213--- a/components/password_manager/core/browser/password_store.cc 3189--- components/password_manager/core/browser/password_store.cc.orig
3214+++ b/components/password_manager/core/browser/password_store.cc 3190+++ components/password_manager/core/browser/password_store.cc
3215@@ -40,7 +40,6 @@ 3191@@ -39,7 +39,6 @@
3216 #include "components/password_manager/core/common/password_manager_features.h" 3192 #include "components/password_manager/core/common/password_manager_features.h"
3217 #include "components/password_manager/core/common/password_manager_pref_names.h" 3193 #include "components/password_manager/core/common/password_manager_pref_names.h"
3218 #include "components/prefs/pref_service.h" 3194 #include "components/prefs/pref_service.h"
@@ -3220,8 +3196,8 @@
3220 #include "components/sync/model/proxy_model_type_controller_delegate.h" 3196 #include "components/sync/model/proxy_model_type_controller_delegate.h"
3221 3197
3222 namespace password_manager { 3198 namespace password_manager {
3223--- a/components/password_manager/core/browser/password_sync_util.cc 3199--- components/password_manager/core/browser/password_sync_util.cc.orig
3224+++ b/components/password_manager/core/browser/password_sync_util.cc 3200+++ components/password_manager/core/browser/password_sync_util.cc
3225@@ -8,7 +8,6 @@ 3201@@ -8,7 +8,6 @@
3226 #include "build/build_config.h" 3202 #include "build/build_config.h"
3227 #include "components/password_manager/core/browser/password_form.h" 3203 #include "components/password_manager/core/browser/password_form.h"
@@ -3242,9 +3218,9 @@
3242 return false; 3218 return false;
3243 } 3219 }
3244 3220
3245--- a/components/password_manager/core/browser/sync_credentials_filter_unittest.cc 3221--- components/password_manager/core/browser/sync_credentials_filter_unittest.cc.orig
3246+++ b/components/password_manager/core/browser/sync_credentials_filter_unittest.cc 3222+++ components/password_manager/core/browser/sync_credentials_filter_unittest.cc
3247@@ -30,7 +30,6 @@ 3223@@ -29,7 +29,6 @@
3248 #include "components/password_manager/core/common/password_manager_features.h" 3224 #include "components/password_manager/core/common/password_manager_features.h"
3249 #include "components/prefs/pref_registry_simple.h" 3225 #include "components/prefs/pref_registry_simple.h"
3250 #include "components/prefs/testing_pref_service.h" 3226 #include "components/prefs/testing_pref_service.h"
@@ -3252,18 +3228,8 @@
3252 #include "testing/gtest/include/gtest/gtest.h" 3228 #include "testing/gtest/include/gtest/gtest.h"
3253 3229
3254 namespace password_manager { 3230 namespace password_manager {
3255--- a/components/reputation/core/safety_tips_config.cc 3231--- components/safe_browsing/content/browser/base_blocking_page.cc.orig
3256+++ b/components/reputation/core/safety_tips_config.cc 3232+++ components/safe_browsing/content/browser/base_blocking_page.cc
3257@@ -5,6 +5,7 @@
3258 #include "components/reputation/core/safety_tips_config.h"
3259
3260 #include "base/no_destructor.h"
3261+#include "base/notreached.h"
3262 #include "base/ranges/algorithm.h"
3263 #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
3264 #include "third_party/re2/src/re2/re2.h"
3265--- a/components/safe_browsing/content/browser/base_blocking_page.cc
3266+++ b/components/safe_browsing/content/browser/base_blocking_page.cc
3267@@ -13,7 +13,6 @@ 3233@@ -13,7 +13,6 @@
3268 #include "base/time/time.h" 3234 #include "base/time/time.h"
3269 #include "components/safe_browsing/content/browser/safe_browsing_controller_client.h" 3235 #include "components/safe_browsing/content/browser/safe_browsing_controller_client.h"
@@ -3272,8 +3238,8 @@
3272 #include "components/security_interstitials/content/security_interstitial_controller_client.h" 3238 #include "components/security_interstitials/content/security_interstitial_controller_client.h"
3273 #include "components/security_interstitials/content/settings_page_helper.h" 3239 #include "components/security_interstitials/content/settings_page_helper.h"
3274 #include "components/security_interstitials/content/unsafe_resource_util.h" 3240 #include "components/security_interstitials/content/unsafe_resource_util.h"
3275--- a/components/safe_browsing/content/browser/client_side_detection_service.cc 3241--- components/safe_browsing/content/browser/client_side_detection_service.cc.orig
3276+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc 3242+++ components/safe_browsing/content/browser/client_side_detection_service.cc
3277@@ -28,7 +28,6 @@ 3243@@ -28,7 +28,6 @@
3278 #include "components/safe_browsing/core/common/features.h" 3244 #include "components/safe_browsing/core/common/features.h"
3279 #include "components/safe_browsing/core/common/proto/client_model.pb.h" 3245 #include "components/safe_browsing/core/common/proto/client_model.pb.h"
@@ -3282,8 +3248,8 @@
3282 #include "components/safe_browsing/core/common/safebrowsing_constants.h" 3248 #include "components/safe_browsing/core/common/safebrowsing_constants.h"
3283 #include "components/safe_browsing/core/common/utils.h" 3249 #include "components/safe_browsing/core/common/utils.h"
3284 #include "content/public/browser/browser_task_traits.h" 3250 #include "content/public/browser/browser_task_traits.h"
3285--- a/components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.cc 3251--- components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.cc.orig
3286+++ b/components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.cc 3252+++ components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.cc
3287@@ -20,7 +20,6 @@ 3253@@ -20,7 +20,6 @@
3288 #include "components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager_util.h" 3254 #include "components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager_util.h"
3289 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" 3255 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
@@ -3301,8 +3267,8 @@
3301 } 3267 }
3302 3268
3303 // static 3269 // static
3304--- a/components/safe_browsing/content/browser/triggers/suspicious_site_trigger_unittest.cc 3270--- components/safe_browsing/content/browser/triggers/suspicious_site_trigger_unittest.cc.orig
3305+++ b/components/safe_browsing/content/browser/triggers/suspicious_site_trigger_unittest.cc 3271+++ components/safe_browsing/content/browser/triggers/suspicious_site_trigger_unittest.cc
3306@@ -11,7 +11,6 @@ 3272@@ -11,7 +11,6 @@
3307 #include "build/build_config.h" 3273 #include "build/build_config.h"
3308 #include "components/prefs/testing_pref_service.h" 3274 #include "components/prefs/testing_pref_service.h"
@@ -3311,8 +3277,8 @@
3311 #include "content/public/test/browser_task_environment.h" 3277 #include "content/public/test/browser_task_environment.h"
3312 #include "content/public/test/navigation_simulator.h" 3278 #include "content/public/test/navigation_simulator.h"
3313 #include "content/public/test/test_renderer_host.h" 3279 #include "content/public/test/test_renderer_host.h"
3314--- a/components/safe_browsing/content/browser/triggers/trigger_manager.cc 3280--- components/safe_browsing/content/browser/triggers/trigger_manager.cc.orig
3315+++ b/components/safe_browsing/content/browser/triggers/trigger_manager.cc 3281+++ components/safe_browsing/content/browser/triggers/trigger_manager.cc
3316@@ -12,7 +12,6 @@ 3282@@ -12,7 +12,6 @@
3317 #include "components/safe_browsing/content/browser/base_ui_manager.h" 3283 #include "components/safe_browsing/content/browser/base_ui_manager.h"
3318 #include "components/safe_browsing/content/browser/threat_details.h" 3284 #include "components/safe_browsing/content/browser/threat_details.h"
@@ -3344,14 +3310,14 @@
3344 /*help_center_article_link=*/std::string()); 3310 /*help_center_article_link=*/std::string());
3345 } 3311 }
3346 3312
3347--- a/components/safe_browsing/content/browser/triggers/trigger_throttler.cc 3313--- components/safe_browsing/content/browser/triggers/trigger_throttler.cc.orig
3348+++ b/components/safe_browsing/content/browser/triggers/trigger_throttler.cc 3314+++ components/safe_browsing/content/browser/triggers/trigger_throttler.cc
3349@@ -197,28 +197,6 @@ void TriggerThrottler::LoadTriggerEvents 3315@@ -197,28 +197,6 @@ void TriggerThrottler::LoadTriggerEvents
3350 trigger_events_.clear(); 3316 trigger_events_.clear();
3351 if (!local_state_prefs_) 3317 if (!local_state_prefs_)
3352 return; 3318 return;
3353- 3319-
3354- const base::Value* event_dict = local_state_prefs_->GetDictionary( 3320- const base::DictionaryValue* event_dict = local_state_prefs_->GetDictionary(
3355- prefs::kSafeBrowsingTriggerEventTimestamps); 3321- prefs::kSafeBrowsingTriggerEventTimestamps);
3356- for (auto trigger_pair : event_dict->DictItems()) { 3322- for (auto trigger_pair : event_dict->DictItems()) {
3357- // Check that the first item in the pair is convertible to a trigger type 3323- // Check that the first item in the pair is convertible to a trigger type
@@ -3366,7 +3332,7 @@
3366- continue; 3332- continue;
3367- 3333-
3368- const TriggerType trigger_type = static_cast<TriggerType>(trigger_type_int); 3334- const TriggerType trigger_type = static_cast<TriggerType>(trigger_type_int);
3369- for (const auto& timestamp : trigger_pair.second.GetListDeprecated()) { 3335- for (const auto& timestamp : trigger_pair.second.GetList()) {
3370- if (timestamp.is_double()) 3336- if (timestamp.is_double())
3371- trigger_events_[trigger_type].push_back( 3337- trigger_events_[trigger_type].push_back(
3372- base::Time::FromDoubleT(timestamp.GetDouble())); 3338- base::Time::FromDoubleT(timestamp.GetDouble()));
@@ -3385,8 +3351,8 @@
3385 } 3351 }
3386 3352
3387 size_t TriggerThrottler::GetDailyQuotaForTrigger( 3353 size_t TriggerThrottler::GetDailyQuotaForTrigger(
3388--- a/components/safe_browsing/content/browser/triggers/trigger_throttler_unittest.cc 3354--- components/safe_browsing/content/browser/triggers/trigger_throttler_unittest.cc.orig
3389+++ b/components/safe_browsing/content/browser/triggers/trigger_throttler_unittest.cc 3355+++ components/safe_browsing/content/browser/triggers/trigger_throttler_unittest.cc
3390@@ -9,7 +9,6 @@ 3356@@ -9,7 +9,6 @@
3391 #include "base/test/simple_test_clock.h" 3357 #include "base/test/simple_test_clock.h"
3392 #include "components/prefs/testing_pref_service.h" 3358 #include "components/prefs/testing_pref_service.h"
@@ -3395,9 +3361,9 @@
3395 #include "testing/gmock/include/gmock/gmock.h" 3361 #include "testing/gmock/include/gmock/gmock.h"
3396 #include "testing/gtest/include/gtest/gtest.h" 3362 #include "testing/gtest/include/gtest/gtest.h"
3397 3363
3398--- a/components/safe_browsing/content/browser/ui_manager.cc 3364--- components/safe_browsing/content/browser/ui_manager.cc.orig
3399+++ b/components/safe_browsing/content/browser/ui_manager.cc 3365+++ components/safe_browsing/content/browser/ui_manager.cc
3400@@ -16,7 +16,6 @@ 3366@@ -18,7 +18,6 @@
3401 #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" 3367 #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
3402 #include "components/safe_browsing/core/browser/ping_manager.h" 3368 #include "components/safe_browsing/core/browser/ping_manager.h"
3403 #include "components/safe_browsing/core/common/features.h" 3369 #include "components/safe_browsing/core/common/features.h"
@@ -3405,9 +3371,9 @@
3405 #include "components/security_interstitials/content/security_interstitial_tab_helper.h" 3371 #include "components/security_interstitials/content/security_interstitial_tab_helper.h"
3406 #include "components/security_interstitials/content/unsafe_resource_util.h" 3372 #include "components/security_interstitials/content/unsafe_resource_util.h"
3407 #include "components/security_interstitials/core/unsafe_resource.h" 3373 #include "components/security_interstitials/core/unsafe_resource.h"
3408--- a/components/safe_browsing/content/browser/ui_manager_unittest.cc 3374--- components/safe_browsing/content/browser/ui_manager_unittest.cc.orig
3409+++ b/components/safe_browsing/content/browser/ui_manager_unittest.cc 3375+++ components/safe_browsing/content/browser/ui_manager_unittest.cc
3410@@ -15,7 +15,6 @@ 3376@@ -14,7 +14,6 @@
3411 #include "components/safe_browsing/content/browser/safe_browsing_controller_client.h" 3377 #include "components/safe_browsing/content/browser/safe_browsing_controller_client.h"
3412 #include "components/safe_browsing/content/browser/ui_manager.h" 3378 #include "components/safe_browsing/content/browser/ui_manager.h"
3413 #include "components/safe_browsing/core/browser/db/util.h" 3379 #include "components/safe_browsing/core/browser/db/util.h"
@@ -3415,8 +3381,8 @@
3415 #include "components/security_interstitials/content/security_interstitial_controller_client.h" 3381 #include "components/security_interstitials/content/security_interstitial_controller_client.h"
3416 #include "components/security_interstitials/content/settings_page_helper.h" 3382 #include "components/security_interstitials/content/settings_page_helper.h"
3417 #include "components/security_interstitials/content/unsafe_resource_util.h" 3383 #include "components/security_interstitials/content/unsafe_resource_util.h"
3418--- a/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc 3384--- components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc.orig
3419+++ b/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc 3385+++ components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc
3420@@ -32,7 +32,6 @@ 3386@@ -32,7 +32,6 @@
3421 #include "components/safe_browsing/core/browser/referrer_chain_provider.h" 3387 #include "components/safe_browsing/core/browser/referrer_chain_provider.h"
3422 #include "components/safe_browsing/core/common/features.h" 3388 #include "components/safe_browsing/core/common/features.h"
@@ -3425,28 +3391,28 @@
3425 #include "services/network/public/mojom/cookie_manager.mojom.h" 3391 #include "services/network/public/mojom/cookie_manager.mojom.h"
3426 #if BUILDFLAG(FULL_SAFE_BROWSING) 3392 #if BUILDFLAG(FULL_SAFE_BROWSING)
3427 #include "components/enterprise/common/proto/connectors.pb.h" 3393 #include "components/enterprise/common/proto/connectors.pb.h"
3428@@ -2043,18 +2042,13 @@ void SafeBrowsingUIHandler::GetPrefs(con 3394@@ -2035,18 +2034,13 @@ void SafeBrowsingUIHandler::GetPrefs(con
3429 AllowJavascript(); 3395 AllowJavascript();
3430 DCHECK(!args.empty()); 3396 DCHECK(!args->GetList().empty());
3431 std::string callback_id = args[0].GetString(); 3397 std::string callback_id = args->GetList()[0].GetString();
3432- ResolveJavascriptCallback(base::Value(callback_id), 3398- ResolveJavascriptCallback(base::Value(callback_id),
3433- safe_browsing::GetSafeBrowsingPreferencesList( 3399- safe_browsing::GetSafeBrowsingPreferencesList(
3434- user_prefs::UserPrefs::Get(browser_context_))); 3400- user_prefs::UserPrefs::Get(browser_context_)));
3435+ ResolveJavascriptCallback(base::Value(callback_id), base::ListValue()); 3401+ ResolveJavascriptCallback(base::Value(callback_id), base::ListValue());
3436 } 3402 }
3437 3403
3438 void SafeBrowsingUIHandler::GetPolicies(const base::Value::ConstListView args) { 3404 void SafeBrowsingUIHandler::GetPolicies(const base::ListValue* args) {
3439 AllowJavascript(); 3405 AllowJavascript();
3440 DCHECK(!args.empty()); 3406 DCHECK(!args->GetList().empty());
3441 std::string callback_id = args[0].GetString(); 3407 std::string callback_id = args->GetList()[0].GetString();
3442- ResolveJavascriptCallback(base::Value(callback_id), 3408- ResolveJavascriptCallback(base::Value(callback_id),
3443- safe_browsing::GetSafeBrowsingPoliciesList( 3409- safe_browsing::GetSafeBrowsingPoliciesList(
3444- user_prefs::UserPrefs::Get(browser_context_))); 3410- user_prefs::UserPrefs::Get(browser_context_)));
3445 } 3411 }
3446 3412
3447 void SafeBrowsingUIHandler::GetCookie(const base::Value::ConstListView args) { 3413 void SafeBrowsingUIHandler::GetCookie(const base::ListValue* args) {
3448--- a/components/safe_browsing/core/browser/db/hit_report.h 3414--- components/safe_browsing/core/browser/db/hit_report.h.orig
3449+++ b/components/safe_browsing/core/browser/db/hit_report.h 3415+++ components/safe_browsing/core/browser/db/hit_report.h
3450@@ -8,7 +8,6 @@ 3416@@ -8,7 +8,6 @@
3451 #define COMPONENTS_SAFE_BROWSING_CORE_BROWSER_DB_HIT_REPORT_H_ 3417 #define COMPONENTS_SAFE_BROWSING_CORE_BROWSER_DB_HIT_REPORT_H_
3452 3418
@@ -3463,8 +3429,8 @@
3463 bool is_enhanced_protection = false; 3429 bool is_enhanced_protection = false;
3464 bool is_metrics_reporting_active; 3430 bool is_metrics_reporting_active;
3465 3431
3466--- a/components/safe_browsing/core/browser/db/util.h 3432--- components/safe_browsing/core/browser/db/util.h.orig
3467+++ b/components/safe_browsing/core/browser/db/util.h 3433+++ components/safe_browsing/core/browser/db/util.h
3468@@ -18,7 +18,6 @@ 3434@@ -18,7 +18,6 @@
3469 #include "base/strings/string_piece.h" 3435 #include "base/strings/string_piece.h"
3470 #include "base/trace_event/traced_value.h" 3436 #include "base/trace_event/traced_value.h"
@@ -3473,9 +3439,9 @@
3473 3439
3474 namespace safe_browsing { 3440 namespace safe_browsing {
3475 3441
3476--- a/components/safe_browsing/core/browser/db/v4_local_database_manager.cc 3442--- components/safe_browsing/core/browser/db/v4_local_database_manager.cc.orig
3477+++ b/components/safe_browsing/core/browser/db/v4_local_database_manager.cc 3443+++ components/safe_browsing/core/browser/db/v4_local_database_manager.cc
3478@@ -334,10 +334,9 @@ const V4LocalDatabaseManager* 3444@@ -337,10 +337,9 @@ const V4LocalDatabaseManager*
3479 scoped_refptr<V4LocalDatabaseManager> V4LocalDatabaseManager::Create( 3445 scoped_refptr<V4LocalDatabaseManager> V4LocalDatabaseManager::Create(
3480 const base::FilePath& base_path, 3446 const base::FilePath& base_path,
3481 scoped_refptr<base::SequencedTaskRunner> ui_task_runner, 3447 scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
@@ -3488,7 +3454,7 @@
3488 std::move(io_task_runner), nullptr)); 3454 std::move(io_task_runner), nullptr));
3489 } 3455 }
3490 3456
3491@@ -360,14 +359,12 @@ void V4LocalDatabaseManager::CollectData 3457@@ -363,14 +362,12 @@ void V4LocalDatabaseManager::CollectData
3492 3458
3493 V4LocalDatabaseManager::V4LocalDatabaseManager( 3459 V4LocalDatabaseManager::V4LocalDatabaseManager(
3494 const base::FilePath& base_path, 3460 const base::FilePath& base_path,
@@ -3503,7 +3469,7 @@
3503 list_infos_(GetListInfos()), 3469 list_infos_(GetListInfos()),
3504 task_runner_(task_runner_for_tests 3470 task_runner_(task_runner_for_tests
3505 ? task_runner_for_tests 3471 ? task_runner_for_tests
3506@@ -1119,8 +1116,7 @@ void V4LocalDatabaseManager::SetupUpdate 3472@@ -1137,8 +1134,7 @@ void V4LocalDatabaseManager::SetupUpdate
3507 weak_factory_.GetWeakPtr()); 3473 weak_factory_.GetWeakPtr());
3508 3474
3509 v4_update_protocol_manager_ = V4UpdateProtocolManager::Create( 3475 v4_update_protocol_manager_ = V4UpdateProtocolManager::Create(
@@ -3513,9 +3479,9 @@
3513 } 3479 }
3514 3480
3515 void V4LocalDatabaseManager::UpdateRequestCompleted( 3481 void V4LocalDatabaseManager::UpdateRequestCompleted(
3516--- a/components/safe_browsing/core/browser/db/v4_local_database_manager.h 3482--- components/safe_browsing/core/browser/db/v4_local_database_manager.h.orig
3517+++ b/components/safe_browsing/core/browser/db/v4_local_database_manager.h 3483+++ components/safe_browsing/core/browser/db/v4_local_database_manager.h
3518@@ -38,8 +38,7 @@ class V4LocalDatabaseManager : public Sa 3484@@ -37,8 +37,7 @@ class V4LocalDatabaseManager : public Sa
3519 static scoped_refptr<V4LocalDatabaseManager> Create( 3485 static scoped_refptr<V4LocalDatabaseManager> Create(
3520 const base::FilePath& base_path, 3486 const base::FilePath& base_path,
3521 scoped_refptr<base::SequencedTaskRunner> ui_task_runner, 3487 scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
@@ -3544,8 +3510,8 @@
3544 // The client_state of each list currently being synced. This is updated each 3510 // The client_state of each list currently being synced. This is updated each
3545 // time a database update completes, and used to send list client_state 3511 // time a database update completes, and used to send list client_state
3546 // information in the full hash request. 3512 // information in the full hash request.
3547--- a/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc 3513--- components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig
3548+++ b/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc 3514+++ components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
3549@@ -88,7 +88,6 @@ void SetSbV4UrlPrefixForTesting(const ch 3515@@ -88,7 +88,6 @@ void SetSbV4UrlPrefixForTesting(const ch
3550 3516
3551 std::string GetReportUrl(const V4ProtocolConfig& config, 3517 std::string GetReportUrl(const V4ProtocolConfig& config,
@@ -3563,8 +3529,8 @@
3563 if (is_enhanced_protection) 3529 if (is_enhanced_protection)
3564 url.append(base::StringPrintf("&enh=%d", is_enhanced_protection)); 3530 url.append(base::StringPrintf("&enh=%d", is_enhanced_protection));
3565 return url; 3531 return url;
3566--- a/components/safe_browsing/core/browser/db/v4_protocol_manager_util.h 3532--- components/safe_browsing/core/browser/db/v4_protocol_manager_util.h.orig
3567+++ b/components/safe_browsing/core/browser/db/v4_protocol_manager_util.h 3533+++ components/safe_browsing/core/browser/db/v4_protocol_manager_util.h
3568@@ -18,10 +18,11 @@ 3534@@ -18,10 +18,11 @@
3569 #include <vector> 3535 #include <vector>
3570 3536
@@ -3586,8 +3552,8 @@
3586 const bool is_enhanced_protection = false); 3552 const bool is_enhanced_protection = false);
3587 3553
3588 // Different types of threats that SafeBrowsing protects against. This is the 3554 // Different types of threats that SafeBrowsing protects against. This is the
3589--- a/components/safe_browsing/core/browser/db/v4_update_protocol_manager.cc 3555--- components/safe_browsing/core/browser/db/v4_update_protocol_manager.cc.orig
3590+++ b/components/safe_browsing/core/browser/db/v4_update_protocol_manager.cc 3556+++ components/safe_browsing/core/browser/db/v4_update_protocol_manager.cc
3591@@ -78,19 +78,8 @@ static const int kV4TimerStartIntervalSe 3557@@ -78,19 +78,8 @@ static const int kV4TimerStartIntervalSe
3592 // Maximum time, in seconds, to wait for a response to an update request. 3558 // Maximum time, in seconds, to wait for a response to an update request.
3593 static const int kV4TimerUpdateWaitSecMax = 15 * 60; // 15 minutes 3559 static const int kV4TimerUpdateWaitSecMax = 15 * 60; // 15 minutes
@@ -3674,9 +3640,9 @@
3674 V4ProtocolManagerUtil::SetClientInfoFromConfig(request.mutable_client(), 3640 V4ProtocolManagerUtil::SetClientInfoFromConfig(request.mutable_client(),
3675 config_); 3641 config_);
3676 3642
3677--- a/components/safe_browsing/core/browser/db/v4_update_protocol_manager.h 3643--- components/safe_browsing/core/browser/db/v4_update_protocol_manager.h.orig
3678+++ b/components/safe_browsing/core/browser/db/v4_update_protocol_manager.h 3644+++ components/safe_browsing/core/browser/db/v4_update_protocol_manager.h
3679@@ -23,7 +23,6 @@ 3645@@ -24,7 +24,6 @@
3680 #include "components/safe_browsing/core/browser/db/util.h" 3646 #include "components/safe_browsing/core/browser/db/util.h"
3681 #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" 3647 #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
3682 #include "components/safe_browsing/core/common/proto/webui.pb.h" 3648 #include "components/safe_browsing/core/common/proto/webui.pb.h"
@@ -3684,7 +3650,7 @@
3684 #include "third_party/abseil-cpp/absl/types/optional.h" 3650 #include "third_party/abseil-cpp/absl/types/optional.h"
3685 3651
3686 class GURL; 3652 class GURL;
3687@@ -44,9 +43,6 @@ class V4UpdateProtocolManagerFactory; 3653@@ -45,9 +44,6 @@ class V4UpdateProtocolManagerFactory;
3688 using V4UpdateCallback = 3654 using V4UpdateCallback =
3689 base::RepeatingCallback<void(std::unique_ptr<ParsedServerResponse>)>; 3655 base::RepeatingCallback<void(std::unique_ptr<ParsedServerResponse>)>;
3690 3656
@@ -3694,7 +3660,7 @@
3694 class V4UpdateProtocolManager { 3660 class V4UpdateProtocolManager {
3695 public: 3661 public:
3696 V4UpdateProtocolManager(const V4UpdateProtocolManager&) = delete; 3662 V4UpdateProtocolManager(const V4UpdateProtocolManager&) = delete;
3697@@ -64,8 +60,7 @@ class V4UpdateProtocolManager { 3663@@ -65,8 +61,7 @@ class V4UpdateProtocolManager {
3698 static std::unique_ptr<V4UpdateProtocolManager> Create( 3664 static std::unique_ptr<V4UpdateProtocolManager> Create(
3699 scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory, 3665 scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
3700 const V4ProtocolConfig& config, 3666 const V4ProtocolConfig& config,
@@ -3704,7 +3670,7 @@
3704 3670
3705 void OnURLLoaderComplete(std::unique_ptr<std::string> response_body); 3671 void OnURLLoaderComplete(std::unique_ptr<std::string> response_body);
3706 3672
3707@@ -87,8 +82,7 @@ class V4UpdateProtocolManager { 3673@@ -88,8 +83,7 @@ class V4UpdateProtocolManager {
3708 V4UpdateProtocolManager( 3674 V4UpdateProtocolManager(
3709 scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory, 3675 scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
3710 const V4ProtocolConfig& config, 3676 const V4ProtocolConfig& config,
@@ -3714,7 +3680,7 @@
3714 3680
3715 private: 3681 private:
3716 FRIEND_TEST_ALL_PREFIXES(V4UpdateProtocolManagerTest, 3682 FRIEND_TEST_ALL_PREFIXES(V4UpdateProtocolManagerTest,
3717@@ -206,8 +200,6 @@ class V4UpdateProtocolManager { 3683@@ -207,8 +201,6 @@ class V4UpdateProtocolManager {
3718 // complete. 3684 // complete.
3719 base::OneShotTimer timeout_timer_; 3685 base::OneShotTimer timeout_timer_;
3720 3686
@@ -3723,7 +3689,7 @@
3723 SEQUENCE_CHECKER(sequence_checker_); 3689 SEQUENCE_CHECKER(sequence_checker_);
3724 }; 3690 };
3725 3691
3726@@ -225,8 +217,7 @@ class V4UpdateProtocolManagerFactory { 3692@@ -226,8 +218,7 @@ class V4UpdateProtocolManagerFactory {
3727 virtual std::unique_ptr<V4UpdateProtocolManager> CreateProtocolManager( 3693 virtual std::unique_ptr<V4UpdateProtocolManager> CreateProtocolManager(
3728 scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory, 3694 scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
3729 const V4ProtocolConfig& config, 3695 const V4ProtocolConfig& config,
@@ -3733,8 +3699,8 @@
3733 }; 3699 };
3734 3700
3735 } // namespace safe_browsing 3701 } // namespace safe_browsing
3736--- a/components/safe_browsing/core/browser/password_protection/password_protection_service_base.h 3702--- components/safe_browsing/core/browser/password_protection/password_protection_service_base.h.orig
3737+++ b/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
3738@@ -28,7 +28,6 @@ 3704@@ -28,7 +28,6 @@
3739 #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h" 3705 #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h"
3740 #include "components/safe_browsing/core/browser/safe_browsing_token_fetcher.h" 3706 #include "components/safe_browsing/core/browser/safe_browsing_token_fetcher.h"
@@ -3754,9 +3720,9 @@
3754 // If |url| matches Safe Browsing allowlist domains, password protection 3720 // If |url| matches Safe Browsing allowlist domains, password protection
3755 // change password URL, or password protection login URLs in the enterprise 3721 // change password URL, or password protection login URLs in the enterprise
3756 // policy. 3722 // policy.
3757--- a/components/safe_browsing/core/browser/ping_manager.cc 3723--- components/safe_browsing/core/browser/ping_manager.cc.orig
3758+++ b/components/safe_browsing/core/browser/ping_manager.cc 3724+++ components/safe_browsing/core/browser/ping_manager.cc
3759@@ -173,7 +173,7 @@ GURL PingManager::SafeBrowsingHitUrl( 3725@@ -141,7 +141,7 @@ GURL PingManager::SafeBrowsingHitUrl(
3760 hit_report.threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING || 3726 hit_report.threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING ||
3761 hit_report.threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE); 3727 hit_report.threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE);
3762 std::string url = 3728 std::string url =
@@ -3765,8 +3731,8 @@
3765 hit_report.is_enhanced_protection); 3731 hit_report.is_enhanced_protection);
3766 std::string threat_list = "none"; 3732 std::string threat_list = "none";
3767 switch (hit_report.threat_type) { 3733 switch (hit_report.threat_type) {
3768--- a/components/safe_browsing/core/browser/realtime/policy_engine.cc 3734--- components/safe_browsing/core/browser/realtime/policy_engine.cc.orig
3769+++ b/components/safe_browsing/core/browser/realtime/policy_engine.cc 3735+++ components/safe_browsing/core/browser/realtime/policy_engine.cc
3770@@ -8,7 +8,6 @@ 3736@@ -8,7 +8,6 @@
3771 #include "base/metrics/histogram_macros.h" 3737 #include "base/metrics/histogram_macros.h"
3772 #include "build/build_config.h" 3738 #include "build/build_config.h"
@@ -3775,7 +3741,7 @@
3775 #include "components/safe_browsing/core/common/utils.h" 3741 #include "components/safe_browsing/core/common/utils.h"
3776 #include "components/unified_consent/pref_names.h" 3742 #include "components/unified_consent/pref_names.h"
3777 #include "components/user_prefs/user_prefs.h" 3743 #include "components/user_prefs/user_prefs.h"
3778@@ -36,7 +35,7 @@ bool RealTimePolicyEngine::IsUserMbbOpte 3744@@ -35,7 +34,7 @@ bool RealTimePolicyEngine::IsUserMbbOpte
3779 3745
3780 // static 3746 // static
3781 bool RealTimePolicyEngine::IsUserEpOptedIn(PrefService* pref_service) { 3747 bool RealTimePolicyEngine::IsUserEpOptedIn(PrefService* pref_service) {
@@ -3784,7 +3750,7 @@
3784 } 3750 }
3785 3751
3786 // static 3752 // static
3787@@ -82,9 +81,7 @@ bool RealTimePolicyEngine::CanPerformEnt 3753@@ -81,9 +80,7 @@ bool RealTimePolicyEngine::CanPerformEnt
3788 return false; 3754 return false;
3789 } 3755 }
3790 3756
@@ -3795,9 +3761,9 @@
3795 } 3761 }
3796 3762
3797 // static 3763 // static
3798--- a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc 3764--- components/safe_browsing/core/browser/realtime/url_lookup_service.cc.orig
3799+++ b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc 3765+++ components/safe_browsing/core/browser/realtime/url_lookup_service.cc
3800@@ -20,7 +20,6 @@ 3766@@ -19,7 +19,6 @@
3801 #include "components/safe_browsing/core/browser/referrer_chain_provider.h" 3767 #include "components/safe_browsing/core/browser/referrer_chain_provider.h"
3802 #include "components/safe_browsing/core/browser/safe_browsing_token_fetcher.h" 3768 #include "components/safe_browsing/core/browser/safe_browsing_token_fetcher.h"
3803 #include "components/safe_browsing/core/common/features.h" 3769 #include "components/safe_browsing/core/common/features.h"
@@ -3805,7 +3771,7 @@
3805 #include "components/unified_consent/pref_names.h" 3771 #include "components/unified_consent/pref_names.h"
3806 #include "net/base/ip_address.h" 3772 #include "net/base/ip_address.h"
3807 #include "net/base/load_flags.h" 3773 #include "net/base/load_flags.h"
3808@@ -63,10 +62,6 @@ RealTimeUrlLookupService::RealTimeUrlLoo 3774@@ -61,10 +60,6 @@ RealTimeUrlLookupService::RealTimeUrlLoo
3809 variations_(variations_service) { 3775 variations_(variations_service) {
3810 pref_change_registrar_.Init(pref_service_); 3776 pref_change_registrar_.Init(pref_service_);
3811 pref_change_registrar_.Add( 3777 pref_change_registrar_.Add(
@@ -3816,7 +3782,7 @@
3816 unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled, 3782 unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled,
3817 base::BindRepeating(&RealTimeUrlLookupService::OnPrefChanged, 3783 base::BindRepeating(&RealTimeUrlLookupService::OnPrefChanged,
3818 base::Unretained(this))); 3784 base::Unretained(this)));
3819@@ -140,7 +135,7 @@ bool RealTimeUrlLookupService::CanSendPa 3785@@ -144,7 +139,7 @@ bool RealTimeUrlLookupService::CanSendPa
3820 } 3786 }
3821 3787
3822 bool RealTimeUrlLookupService::CanCheckSubresourceURL() const { 3788 bool RealTimeUrlLookupService::CanCheckSubresourceURL() const {
@@ -3825,35 +3791,22 @@
3825 } 3791 }
3826 3792
3827 bool RealTimeUrlLookupService::CanCheckSafeBrowsingDb() const { 3793 bool RealTimeUrlLookupService::CanCheckSafeBrowsingDb() const {
3828@@ -150,11 +145,7 @@ bool RealTimeUrlLookupService::CanCheckS 3794--- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig
3829 } 3795+++ components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
3830 3796@@ -16,7 +16,6 @@
3831 bool RealTimeUrlLookupService::CanSendRTSampleRequest() const { 3797 #include "components/prefs/pref_service.h"
3832- return IsExtendedReportingEnabled(*pref_service_) &&
3833- base::FeatureList::IsEnabled(
3834- safe_browsing::kSendSampledPingsForProtegoAllowlistDomains) &&
3835- (bypass_protego_probability_for_tests_ ||
3836- base::RandDouble() <= kProbabilityForSendingSampledRequests);
3837+ return false;
3838 }
3839
3840 void RealTimeUrlLookupService::Shutdown() {
3841--- a/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
3842+++ b/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
3843@@ -17,7 +17,6 @@
3844 #include "components/safe_browsing/core/browser/referrer_chain_provider.h" 3798 #include "components/safe_browsing/core/browser/referrer_chain_provider.h"
3845 #include "components/safe_browsing/core/browser/verdict_cache_manager.h" 3799 #include "components/safe_browsing/core/browser/verdict_cache_manager.h"
3846 #include "components/safe_browsing/core/common/features.h"
3847-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 3800-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
3848 #include "components/safe_browsing/core/common/safebrowsing_constants.h" 3801 #include "components/safe_browsing/core/common/safebrowsing_constants.h"
3849 #include "components/safe_browsing/core/common/utils.h" 3802 #include "components/safe_browsing/core/common/utils.h"
3850 #include "net/base/ip_address.h" 3803 #include "net/base/ip_address.h"
3851--- a/components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc 3804--- components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc.orig
3852+++ b/components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc 3805+++ components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc
3853@@ -12,13 +12,11 @@ 3806@@ -11,13 +11,11 @@
3807 #include "base/time/time.h"
3854 #include "components/prefs/pref_service.h" 3808 #include "components/prefs/pref_service.h"
3855 #include "components/prefs/scoped_user_pref_update.h" 3809 #include "components/prefs/scoped_user_pref_update.h"
3856 #include "components/safe_browsing/core/browser/db/hit_report.h"
3857-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 3810-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
3858 3811
3859 namespace { 3812 namespace {
@@ -3864,7 +3817,7 @@
3864 3817
3865 const int kMetricsLoggingIntervalDay = 1; 3818 const int kMetricsLoggingIntervalDay = 1;
3866 3819
3867@@ -59,11 +57,6 @@ SafeBrowsingMetricsCollector::SafeBrowsi 3820@@ -54,11 +52,6 @@ SafeBrowsingMetricsCollector::SafeBrowsi
3868 PrefService* pref_service) 3821 PrefService* pref_service)
3869 : pref_service_(pref_service) { 3822 : pref_service_(pref_service) {
3870 pref_change_registrar_.Init(pref_service_); 3823 pref_change_registrar_.Init(pref_service_);
@@ -3876,7 +3829,7 @@
3876 } 3829 }
3877 3830
3878 void SafeBrowsingMetricsCollector::Shutdown() { 3831 void SafeBrowsingMetricsCollector::Shutdown() {
3879@@ -71,16 +64,6 @@ void SafeBrowsingMetricsCollector::Shutd 3832@@ -66,16 +59,6 @@ void SafeBrowsingMetricsCollector::Shutd
3880 } 3833 }
3881 3834
3882 void SafeBrowsingMetricsCollector::StartLogging() { 3835 void SafeBrowsingMetricsCollector::StartLogging() {
@@ -3893,7 +3846,7 @@
3893 } 3846 }
3894 3847
3895 void SafeBrowsingMetricsCollector::LogMetricsAndScheduleNextLogging() { 3848 void SafeBrowsingMetricsCollector::LogMetricsAndScheduleNextLogging() {
3896@@ -88,9 +71,6 @@ void SafeBrowsingMetricsCollector::LogMe 3849@@ -83,9 +66,6 @@ void SafeBrowsingMetricsCollector::LogMe
3897 LogDailyEventMetrics(); 3850 LogDailyEventMetrics();
3898 RemoveOldEventsFromPref(); 3851 RemoveOldEventsFromPref();
3899 3852
@@ -3903,7 +3856,7 @@
3903 ScheduleNextLoggingAfterInterval(base::Days(kMetricsLoggingIntervalDay)); 3856 ScheduleNextLoggingAfterInterval(base::Days(kMetricsLoggingIntervalDay));
3904 } 3857 }
3905 3858
3906@@ -103,87 +83,16 @@ void SafeBrowsingMetricsCollector::Sched 3859@@ -98,181 +78,40 @@ void SafeBrowsingMetricsCollector::Sched
3907 } 3860 }
3908 3861
3909 void SafeBrowsingMetricsCollector::LogDailyOptInMetrics() { 3862 void SafeBrowsingMetricsCollector::LogDailyOptInMetrics() {
@@ -3961,7 +3914,7 @@
3961 void SafeBrowsingMetricsCollector::RemoveOldEventsFromPref() { 3914 void SafeBrowsingMetricsCollector::RemoveOldEventsFromPref() {
3962- DictionaryPrefUpdate update(pref_service_, 3915- DictionaryPrefUpdate update(pref_service_,
3963- prefs::kSafeBrowsingEventTimestamps); 3916- prefs::kSafeBrowsingEventTimestamps);
3964- base::Value* mutable_state_dict = update.Get(); 3917- base::DictionaryValue* mutable_state_dict = update.Get();
3965- bool is_pref_valid = mutable_state_dict->is_dict(); 3918- bool is_pref_valid = mutable_state_dict->is_dict();
3966- base::UmaHistogramBoolean("SafeBrowsing.MetricsCollector.IsPrefValid", 3919- base::UmaHistogramBoolean("SafeBrowsing.MetricsCollector.IsPrefValid",
3967- is_pref_valid); 3920- is_pref_valid);
@@ -3990,30 +3943,47 @@
3990- AddSafeBrowsingEventAndUserStateToPref(GetUserState(), event_type); 3943- AddSafeBrowsingEventAndUserStateToPref(GetUserState(), event_type);
3991 } 3944 }
3992 3945
3993 void SafeBrowsingMetricsCollector::AddBypassEventToPref( 3946 absl::optional<base::Time>
3994@@ -220,15 +129,7 @@ absl::optional<base::Time> 3947 SafeBrowsingMetricsCollector::GetLatestEventTimestamp(EventType event_type) {
3995 SafeBrowsingMetricsCollector::GetLatestEventTimestamp( 3948- // Events are not logged when Safe Browsing is disabled.
3996 EventTypeFilter event_type_filter) {
3997 // Events are not logged when Safe Browsing is disabled.
3998- SafeBrowsingState sb_state = GetSafeBrowsingState(*pref_service_); 3949- SafeBrowsingState sb_state = GetSafeBrowsingState(*pref_service_);
3999- if (sb_state == SafeBrowsingState::NO_SAFE_BROWSING) { 3950- if (sb_state == SafeBrowsingState::NO_SAFE_BROWSING) {
4000 return absl::nullopt; 3951 return absl::nullopt;
4001- } 3952- }
4002- 3953-
4003- const absl::optional<Event> event = 3954- const absl::optional<Event> event =
4004- GetLatestEventFromEventTypeFilter(GetUserState(), event_type_filter); 3955- GetLatestEventFromEventType(GetUserState(), event_type);
4005- return event ? absl::optional<base::Time>(event.value().timestamp) 3956- return event ? absl::optional<base::Time>(event.value().timestamp)
4006- : absl::nullopt; 3957- : absl::nullopt;
4007 } 3958 }
4008 3959
4009 absl::optional<base::Time> 3960 absl::optional<base::Time>
4010@@ -240,55 +141,14 @@ SafeBrowsingMetricsCollector::GetLatestS 3961 SafeBrowsingMetricsCollector::GetLatestSecuritySensitiveEventTimestamp() {
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
4011 void SafeBrowsingMetricsCollector::AddSafeBrowsingEventAndUserStateToPref( 3981 void SafeBrowsingMetricsCollector::AddSafeBrowsingEventAndUserStateToPref(
4012 UserState user_state, 3982 UserState user_state,
4013 EventType event_type) { 3983 EventType event_type) {
4014- DictionaryPrefUpdate update(pref_service_, 3984- DictionaryPrefUpdate update(pref_service_,
4015- prefs::kSafeBrowsingEventTimestamps); 3985- prefs::kSafeBrowsingEventTimestamps);
4016- base::Value* mutable_state_dict = update.Get(); 3986- base::DictionaryValue* mutable_state_dict = update.Get();
4017- 3987-
4018- base::Value* event_dict = 3988- base::Value* event_dict =
4019- mutable_state_dict->FindDictKey(UserStateToPrefKey(user_state)); 3989- mutable_state_dict->FindDictKey(UserStateToPrefKey(user_state));
@@ -4031,8 +4001,8 @@
4031- } 4001- }
4032- 4002-
4033- // Remove the oldest timestamp if the length of the timestamps hits the limit. 4003- // Remove the oldest timestamp if the length of the timestamps hits the limit.
4034- while (timestamps->GetListDeprecated().size() >= kTimestampsMaxLength) { 4004- while (timestamps->GetList().size() >= kTimestampsMaxLength) {
4035- timestamps->EraseListIter(timestamps->GetListDeprecated().begin()); 4005- timestamps->EraseListIter(timestamps->GetList().begin());
4036- } 4006- }
4037- 4007-
4038- timestamps->Append(TimeToPrefValue(base::Time::Now())); 4008- timestamps->Append(TimeToPrefValue(base::Time::Now()));
@@ -4047,7 +4017,12 @@
4047- if (!pref_service_->GetBoolean(prefs::kSafeBrowsingEnhanced)) { 4017- if (!pref_service_->GetBoolean(prefs::kSafeBrowsingEnhanced)) {
4048- AddSafeBrowsingEventAndUserStateToPref(UserState::kEnhancedProtection, 4018- AddSafeBrowsingEventAndUserStateToPref(UserState::kEnhancedProtection,
4049- EventType::USER_STATE_DISABLED); 4019- EventType::USER_STATE_DISABLED);
4050- LogEnhancedProtectionDisabledMetrics(); 4020- int disabled_times_last_week = GetEventCountSince(
4021- UserState::kEnhancedProtection, EventType::USER_STATE_DISABLED,
4022- base::Time::Now() - base::Days(7));
4023- if (disabled_times_last_week <= kEsbDisabledMetricsQuota) {
4024- LogEnhancedProtectionDisabledMetrics();
4025- }
4051- } else { 4026- } else {
4052- AddSafeBrowsingEventAndUserStateToPref(UserState::kEnhancedProtection, 4027- AddSafeBrowsingEventAndUserStateToPref(UserState::kEnhancedProtection,
4053- EventType::USER_STATE_ENABLED); 4028- EventType::USER_STATE_ENABLED);
@@ -4056,7 +4031,7 @@
4056 4031
4057 const base::Value* SafeBrowsingMetricsCollector::GetSafeBrowsingEventDictionary( 4032 const base::Value* SafeBrowsingMetricsCollector::GetSafeBrowsingEventDictionary(
4058 UserState user_state) { 4033 UserState user_state) {
4059- const base::Value* state_dict = 4034- const base::DictionaryValue* state_dict =
4060- pref_service_->GetDictionary(prefs::kSafeBrowsingEventTimestamps); 4035- pref_service_->GetDictionary(prefs::kSafeBrowsingEventTimestamps);
4061- 4036-
4062- return state_dict->FindDictKey(UserStateToPrefKey(user_state)); 4037- return state_dict->FindDictKey(UserStateToPrefKey(user_state));
@@ -4064,7 +4039,7 @@
4064 } 4039 }
4065 4040
4066 absl::optional<SafeBrowsingMetricsCollector::Event> 4041 absl::optional<SafeBrowsingMetricsCollector::Event>
4067@@ -449,20 +309,7 @@ int SafeBrowsingMetricsCollector::GetEve 4042@@ -370,20 +209,7 @@ int SafeBrowsingMetricsCollector::GetEve
4068 } 4043 }
4069 4044
4070 UserState SafeBrowsingMetricsCollector::GetUserState() { 4045 UserState SafeBrowsingMetricsCollector::GetUserState() {
@@ -4086,8 +4061,8 @@
4086 } 4061 }
4087 4062
4088 bool SafeBrowsingMetricsCollector::IsBypassEventType(const EventType& type) { 4063 bool SafeBrowsingMetricsCollector::IsBypassEventType(const EventType& type) {
4089--- a/components/safe_browsing/core/common/BUILD.gn 4064--- components/safe_browsing/core/common/BUILD.gn.orig
4090+++ b/components/safe_browsing/core/common/BUILD.gn 4065+++ components/safe_browsing/core/common/BUILD.gn
4091@@ -6,20 +6,8 @@ import("//build/config/features.gni") 4066@@ -6,20 +6,8 @@ import("//build/config/features.gni")
4092 import("//components/safe_browsing/buildflags.gni") 4067 import("//components/safe_browsing/buildflags.gni")
4093 import("//mojo/public/tools/bindings/mojom.gni") 4068 import("//mojo/public/tools/bindings/mojom.gni")
@@ -4111,8 +4086,8 @@
4111 } 4086 }
4112 4087
4113 source_set("safe_browsing_policy_handler") { 4088 source_set("safe_browsing_policy_handler") {
4114--- a/components/safe_browsing/core/common/safe_browsing_policy_handler.cc 4089--- components/safe_browsing/core/common/safe_browsing_policy_handler.cc.orig
4115+++ b/components/safe_browsing/core/common/safe_browsing_policy_handler.cc 4090+++ components/safe_browsing/core/common/safe_browsing_policy_handler.cc
4116@@ -11,7 +11,6 @@ 4091@@ -11,7 +11,6 @@
4117 #include "components/policy/policy_constants.h" 4092 #include "components/policy/policy_constants.h"
4118 #include "components/prefs/pref_service.h" 4093 #include "components/prefs/pref_service.h"
@@ -4171,8 +4146,8 @@
4171 DCHECK_EQ(is_safe_browsing_enabled_managed, 4146 DCHECK_EQ(is_safe_browsing_enabled_managed,
4172 is_safe_browsing_enhanced_managed); 4147 is_safe_browsing_enhanced_managed);
4173 return is_safe_browsing_enabled_managed && is_safe_browsing_enhanced_managed; 4148 return is_safe_browsing_enabled_managed && is_safe_browsing_enhanced_managed;
4174--- a/components/safe_browsing/core/common/safe_browsing_prefs_unittest.cc 4149--- components/safe_browsing/core/common/safe_browsing_prefs_unittest.cc.orig
4175+++ b/components/safe_browsing/core/common/safe_browsing_prefs_unittest.cc 4150+++ components/safe_browsing/core/common/safe_browsing_prefs_unittest.cc
4176@@ -12,7 +12,6 @@ 4151@@ -12,7 +12,6 @@
4177 #include "components/prefs/pref_registry_simple.h" 4152 #include "components/prefs/pref_registry_simple.h"
4178 #include "components/prefs/testing_pref_service.h" 4153 #include "components/prefs/testing_pref_service.h"
@@ -4181,8 +4156,8 @@
4181 #include "testing/gtest/include/gtest/gtest.h" 4156 #include "testing/gtest/include/gtest/gtest.h"
4182 #include "url/gurl.h" 4157 #include "url/gurl.h"
4183 4158
4184--- a/components/safety_check/safety_check.cc 4159--- components/safety_check/safety_check.cc.orig
4185+++ b/components/safety_check/safety_check.cc 4160+++ components/safety_check/safety_check.cc
4186@@ -4,26 +4,9 @@ 4161@@ -4,26 +4,9 @@
4187 4162
4188 #include "components/safety_check/safety_check.h" 4163 #include "components/safety_check/safety_check.h"
@@ -4210,8 +4185,8 @@
4210 return SafeBrowsingStatus::kDisabled; 4185 return SafeBrowsingStatus::kDisabled;
4211 } 4186 }
4212 4187
4213--- a/components/security_interstitials/content/bad_clock_blocking_page.cc 4188--- components/security_interstitials/content/bad_clock_blocking_page.cc.orig
4214+++ b/components/security_interstitials/content/bad_clock_blocking_page.cc 4189+++ components/security_interstitials/content/bad_clock_blocking_page.cc
4215@@ -7,7 +7,6 @@ 4190@@ -7,7 +7,6 @@
4216 #include <utility> 4191 #include <utility>
4217 4192
@@ -4220,8 +4195,8 @@
4220 #include "components/security_interstitials/content/cert_report_helper.h" 4195 #include "components/security_interstitials/content/cert_report_helper.h"
4221 #include "components/security_interstitials/content/security_interstitial_controller_client.h" 4196 #include "components/security_interstitials/content/security_interstitial_controller_client.h"
4222 #include "components/security_interstitials/content/security_interstitial_page.h" 4197 #include "components/security_interstitials/content/security_interstitial_page.h"
4223--- a/components/security_interstitials/content/captive_portal_blocking_page.cc 4198--- components/security_interstitials/content/captive_portal_blocking_page.cc.orig
4224+++ b/components/security_interstitials/content/captive_portal_blocking_page.cc 4199+++ components/security_interstitials/content/captive_portal_blocking_page.cc
4225@@ -15,7 +15,6 @@ 4200@@ -15,7 +15,6 @@
4226 #include "build/build_config.h" 4201 #include "build/build_config.h"
4227 #include "components/captive_portal/core/captive_portal_detector.h" 4202 #include "components/captive_portal/core/captive_portal_detector.h"
@@ -4230,8 +4205,8 @@
4230 #include "components/security_interstitials/content/cert_report_helper.h" 4205 #include "components/security_interstitials/content/cert_report_helper.h"
4231 #include "components/security_interstitials/content/security_interstitial_controller_client.h" 4206 #include "components/security_interstitials/content/security_interstitial_controller_client.h"
4232 #include "components/security_interstitials/content/ssl_cert_reporter.h" 4207 #include "components/security_interstitials/content/ssl_cert_reporter.h"
4233--- a/components/security_interstitials/content/cert_report_helper.cc 4208--- components/security_interstitials/content/cert_report_helper.cc.orig
4234+++ b/components/security_interstitials/content/cert_report_helper.cc 4209+++ components/security_interstitials/content/cert_report_helper.cc
4235@@ -14,7 +14,6 @@ 4210@@ -14,7 +14,6 @@
4236 #include "build/branding_buildflags.h" 4211 #include "build/branding_buildflags.h"
4237 #include "build/build_config.h" 4212 #include "build/build_config.h"
@@ -4328,8 +4303,8 @@
4328 } 4303 }
4329 4304
4330 bool CertReportHelper::ShouldReportCertificateError() { 4305 bool CertReportHelper::ShouldReportCertificateError() {
4331--- a/components/security_interstitials/content/mitm_software_blocking_page.cc 4306--- components/security_interstitials/content/mitm_software_blocking_page.cc.orig
4332+++ b/components/security_interstitials/content/mitm_software_blocking_page.cc 4307+++ components/security_interstitials/content/mitm_software_blocking_page.cc
4333@@ -6,7 +6,6 @@ 4308@@ -6,7 +6,6 @@
4334 4309
4335 #include <utility> 4310 #include <utility>
@@ -4338,8 +4313,8 @@
4338 #include "components/security_interstitials/content/cert_report_helper.h" 4313 #include "components/security_interstitials/content/cert_report_helper.h"
4339 #include "components/security_interstitials/content/security_interstitial_controller_client.h" 4314 #include "components/security_interstitials/content/security_interstitial_controller_client.h"
4340 #include "components/security_interstitials/content/security_interstitial_page.h" 4315 #include "components/security_interstitials/content/security_interstitial_page.h"
4341--- a/components/security_interstitials/content/security_interstitial_controller_client.cc 4316--- components/security_interstitials/content/security_interstitial_controller_client.cc.orig
4342+++ b/components/security_interstitials/content/security_interstitial_controller_client.cc 4317+++ components/security_interstitials/content/security_interstitial_controller_client.cc
4343@@ -7,7 +7,6 @@ 4318@@ -7,7 +7,6 @@
4344 #include <utility> 4319 #include <utility>
4345 4320
@@ -4347,8 +4322,8 @@
4347-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" 4322-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
4348 #include "components/security_interstitials/content/settings_page_helper.h" 4323 #include "components/security_interstitials/content/settings_page_helper.h"
4349 #include "components/security_interstitials/core/metrics_helper.h" 4324 #include "components/security_interstitials/core/metrics_helper.h"
4350 #include "content/public/browser/navigation_entry.h" 4325 #include "content/public/browser/web_contents.h"
4351@@ -99,11 +98,6 @@ SecurityInterstitialControllerClient::Ge 4326@@ -98,11 +97,6 @@ SecurityInterstitialControllerClient::Ge
4352 return prefs_; 4327 return prefs_;
4353 } 4328 }
4354 4329
@@ -4360,19 +4335,19 @@
4360 bool SecurityInterstitialControllerClient::CanLaunchDateAndTimeSettings() { 4335 bool SecurityInterstitialControllerClient::CanLaunchDateAndTimeSettings() {
4361 NOTREACHED(); 4336 NOTREACHED();
4362 return false; 4337 return false;
4363--- a/components/security_interstitials/content/security_interstitial_controller_client.h 4338--- components/security_interstitials/content/security_interstitial_controller_client.h.orig
4364+++ b/components/security_interstitials/content/security_interstitial_controller_client.h 4339+++ components/security_interstitials/content/security_interstitial_controller_client.h
4365@@ -54,8 +54,6 @@ class SecurityInterstitialControllerClie 4340@@ -54,8 +54,6 @@ class SecurityInterstitialControllerClie
4366 bool CanGoBackBeforeNavigation() override; 4341 bool CanGoBackBeforeNavigation() override;
4367 4342
4368 protected: 4343 protected:
4369- // security_interstitials::ControllerClient overrides. 4344- // security_interstitials::ControllerClient overrides.
4370- const std::string GetExtendedReportingPrefName() const override; 4345- const std::string GetExtendedReportingPrefName() const override;
4371 raw_ptr<content::WebContents> web_contents_; 4346 content::WebContents* web_contents_;
4372 4347
4373 private: 4348 private:
4374--- a/components/security_interstitials/content/security_interstitial_page.cc 4349--- components/security_interstitials/content/security_interstitial_page.cc.orig
4375+++ b/components/security_interstitials/content/security_interstitial_page.cc 4350+++ components/security_interstitials/content/security_interstitial_page.cc
4376@@ -11,7 +11,6 @@ 4351@@ -11,7 +11,6 @@
4377 #include "base/values.h" 4352 #include "base/values.h"
4378 #include "components/grit/components_resources.h" 4353 #include "components/grit/components_resources.h"
@@ -4413,8 +4388,8 @@
4413 } 4388 }
4414 4389
4415 std::u16string SecurityInterstitialPage::GetFormattedHostName() const { 4390 std::u16string SecurityInterstitialPage::GetFormattedHostName() const {
4416--- a/components/security_interstitials/content/ssl_blocking_page.cc 4391--- components/security_interstitials/content/ssl_blocking_page.cc.orig
4417+++ b/components/security_interstitials/content/ssl_blocking_page.cc 4392+++ components/security_interstitials/content/ssl_blocking_page.cc
4418@@ -12,7 +12,6 @@ 4393@@ -12,7 +12,6 @@
4419 #include "base/metrics/histogram_macros.h" 4394 #include "base/metrics/histogram_macros.h"
4420 #include "base/strings/string_number_conversions.h" 4395 #include "base/strings/string_number_conversions.h"
@@ -4423,8 +4398,8 @@
4423 #include "components/security_interstitials/content/cert_report_helper.h" 4398 #include "components/security_interstitials/content/cert_report_helper.h"
4424 #include "components/security_interstitials/content/security_interstitial_controller_client.h" 4399 #include "components/security_interstitials/content/security_interstitial_controller_client.h"
4425 #include "components/security_interstitials/content/security_interstitial_page.h" 4400 #include "components/security_interstitials/content/security_interstitial_page.h"
4426--- a/components/security_interstitials/core/controller_client.cc 4401--- components/security_interstitials/core/controller_client.cc.orig
4427+++ b/components/security_interstitials/core/controller_client.cc 4402+++ components/security_interstitials/core/controller_client.cc
4428@@ -36,7 +36,6 @@ MetricsHelper* ControllerClient::metrics 4403@@ -36,7 +36,6 @@ MetricsHelper* ControllerClient::metrics
4429 4404
4430 void ControllerClient::SetReportingPreference(bool report) { 4405 void ControllerClient::SetReportingPreference(bool report) {
@@ -4433,9 +4408,9 @@
4433 metrics_helper_->RecordUserInteraction( 4408 metrics_helper_->RecordUserInteraction(
4434 report ? MetricsHelper::SET_EXTENDED_REPORTING_ENABLED 4409 report ? MetricsHelper::SET_EXTENDED_REPORTING_ENABLED
4435 : MetricsHelper::SET_EXTENDED_REPORTING_DISABLED); 4410 : MetricsHelper::SET_EXTENDED_REPORTING_DISABLED);
4436--- a/components/security_interstitials/core/controller_client.h 4411--- components/security_interstitials/core/controller_client.h.orig
4437+++ b/components/security_interstitials/core/controller_client.h 4412+++ components/security_interstitials/core/controller_client.h
4438@@ -121,9 +121,6 @@ class ControllerClient { 4413@@ -122,9 +122,6 @@ class ControllerClient {
4439 4414
4440 void SetBaseHelpCenterUrlForTesting(const GURL& test_url); 4415 void SetBaseHelpCenterUrlForTesting(const GURL& test_url);
4441 4416
@@ -4445,8 +4420,8 @@
4445 private: 4420 private:
4446 std::unique_ptr<MetricsHelper> metrics_helper_; 4421 std::unique_ptr<MetricsHelper> metrics_helper_;
4447 // Link to the help center. 4422 // Link to the help center.
4448--- a/components/signin/core/browser/account_investigator.cc 4423--- components/signin/core/browser/account_investigator.cc.orig
4449+++ b/components/signin/core/browser/account_investigator.cc 4424+++ components/signin/core/browser/account_investigator.cc
4450@@ -13,7 +13,6 @@ 4425@@ -13,7 +13,6 @@
4451 #include "components/prefs/pref_registry_simple.h" 4426 #include "components/prefs/pref_registry_simple.h"
4452 #include "components/prefs/pref_service.h" 4427 #include "components/prefs/pref_service.h"
@@ -4521,8 +4496,8 @@
4521 base::TimeDelta stable_age; 4496 base::TimeDelta stable_age;
4522 if (!last_changed.is_null()) 4497 if (!last_changed.is_null())
4523 stable_age = std::max(now - last_changed, base::TimeDelta()); 4498 stable_age = std::max(now - last_changed, base::TimeDelta());
4524--- a/components/signin/core/browser/account_investigator_unittest.cc 4499--- components/signin/core/browser/account_investigator_unittest.cc.orig
4525+++ b/components/signin/core/browser/account_investigator_unittest.cc 4500+++ components/signin/core/browser/account_investigator_unittest.cc
4526@@ -12,7 +12,6 @@ 4501@@ -12,7 +12,6 @@
4527 #include "build/build_config.h" 4502 #include "build/build_config.h"
4528 #include "components/prefs/pref_registry_simple.h" 4503 #include "components/prefs/pref_registry_simple.h"
@@ -4531,8 +4506,8 @@
4531 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" 4506 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
4532 #include "components/signin/public/identity_manager/identity_test_environment.h" 4507 #include "components/signin/public/identity_manager/identity_test_environment.h"
4533 #include "components/sync_preferences/testing_pref_service_syncable.h" 4508 #include "components/sync_preferences/testing_pref_service_syncable.h"
4534--- a/components/signin/core/browser/account_reconcilor_unittest.cc 4509--- components/signin/core/browser/account_reconcilor_unittest.cc.orig
4535+++ b/components/signin/core/browser/account_reconcilor_unittest.cc 4510+++ components/signin/core/browser/account_reconcilor_unittest.cc
4536@@ -29,7 +29,6 @@ 4511@@ -29,7 +29,6 @@
4537 #include "components/signin/public/base/list_accounts_test_utils.h" 4512 #include "components/signin/public/base/list_accounts_test_utils.h"
4538 #include "components/signin/public/base/signin_buildflags.h" 4513 #include "components/signin/public/base/signin_buildflags.h"
@@ -4541,8 +4516,8 @@
4541 #include "components/signin/public/base/test_signin_client.h" 4516 #include "components/signin/public/base/test_signin_client.h"
4542 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" 4517 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
4543 #include "components/signin/public/identity_manager/identity_test_environment.h" 4518 #include "components/signin/public/identity_manager/identity_test_environment.h"
4544--- a/components/signin/core/browser/dice_account_reconcilor_delegate.cc 4519--- components/signin/core/browser/dice_account_reconcilor_delegate.cc.orig
4545+++ b/components/signin/core/browser/dice_account_reconcilor_delegate.cc 4520+++ components/signin/core/browser/dice_account_reconcilor_delegate.cc
4546@@ -12,7 +12,6 @@ 4521@@ -12,7 +12,6 @@
4547 #include "base/ranges/algorithm.h" 4522 #include "base/ranges/algorithm.h"
4548 #include "components/prefs/pref_service.h" 4523 #include "components/prefs/pref_service.h"
@@ -4551,8 +4526,8 @@
4551 4526
4552 namespace signin { 4527 namespace signin {
4553 4528
4554--- a/components/signin/core/browser/dice_account_reconcilor_delegate_unittest.cc 4529--- components/signin/core/browser/dice_account_reconcilor_delegate_unittest.cc.orig
4555+++ b/components/signin/core/browser/dice_account_reconcilor_delegate_unittest.cc 4530+++ components/signin/core/browser/dice_account_reconcilor_delegate_unittest.cc
4556@@ -8,7 +8,6 @@ 4531@@ -8,7 +8,6 @@
4557 4532
4558 #include "components/prefs/pref_registry_simple.h" 4533 #include "components/prefs/pref_registry_simple.h"
@@ -4561,8 +4536,8 @@
4561 #include "components/signin/public/base/test_signin_client.h" 4536 #include "components/signin/public/base/test_signin_client.h"
4562 #include "components/sync_preferences/testing_pref_service_syncable.h" 4537 #include "components/sync_preferences/testing_pref_service_syncable.h"
4563 #include "google_apis/gaia/gaia_auth_util.h" 4538 #include "google_apis/gaia/gaia_auth_util.h"
4564--- a/components/signin/core/browser/signin_investigator.cc 4539--- components/signin/core/browser/signin_investigator.cc.orig
4565+++ b/components/signin/core/browser/signin_investigator.cc 4540+++ components/signin/core/browser/signin_investigator.cc
4566@@ -7,7 +7,6 @@ 4541@@ -7,7 +7,6 @@
4567 #include "base/check.h" 4542 #include "base/check.h"
4568 #include "base/metrics/histogram_macros.h" 4543 #include "base/metrics/histogram_macros.h"
@@ -4599,8 +4574,8 @@
4599 scenario = InvestigatedScenario::kFirstSignIn; 4574 scenario = InvestigatedScenario::kFirstSignIn;
4600 } else if (AreAccountsEqualWithFallback()) { 4575 } else if (AreAccountsEqualWithFallback()) {
4601 scenario = InvestigatedScenario::kSameAccount; 4576 scenario = InvestigatedScenario::kSameAccount;
4602--- a/components/signin/core/browser/signin_investigator_unittest.cc 4577--- components/signin/core/browser/signin_investigator_unittest.cc.orig
4603+++ b/components/signin/core/browser/signin_investigator_unittest.cc 4578+++ components/signin/core/browser/signin_investigator_unittest.cc
4604@@ -9,7 +9,6 @@ 4579@@ -9,7 +9,6 @@
4605 #include "components/prefs/pref_registry_simple.h" 4580 #include "components/prefs/pref_registry_simple.h"
4606 #include "components/signin/core/browser/signin_investigator.h" 4581 #include "components/signin/core/browser/signin_investigator.h"
@@ -4609,8 +4584,8 @@
4609 #include "components/signin/public/identity_manager/identity_test_environment.h" 4584 #include "components/signin/public/identity_manager/identity_test_environment.h"
4610 #include "components/sync_preferences/testing_pref_service_syncable.h" 4585 #include "components/sync_preferences/testing_pref_service_syncable.h"
4611 #include "testing/gtest/include/gtest/gtest.h" 4586 #include "testing/gtest/include/gtest/gtest.h"
4612--- a/components/signin/internal/identity_manager/account_tracker_service.cc 4587--- components/signin/internal/identity_manager/account_tracker_service.cc.orig
4613+++ b/components/signin/internal/identity_manager/account_tracker_service.cc 4588+++ components/signin/internal/identity_manager/account_tracker_service.cc
4614@@ -29,7 +29,6 @@ 4589@@ -29,7 +29,6 @@
4615 #include "components/prefs/scoped_user_pref_update.h" 4590 #include "components/prefs/scoped_user_pref_update.h"
4616 #include "components/signin/internal/identity_manager/account_capabilities_constants.h" 4591 #include "components/signin/internal/identity_manager/account_capabilities_constants.h"
@@ -4619,7 +4594,7 @@
4619 #include "components/signin/public/base/signin_switches.h" 4594 #include "components/signin/public/base/signin_switches.h"
4620 #include "components/signin/public/identity_manager/account_capabilities.h" 4595 #include "components/signin/public/identity_manager/account_capabilities.h"
4621 #include "components/signin/public/identity_manager/tribool.h" 4596 #include "components/signin/public/identity_manager/tribool.h"
4622@@ -160,9 +159,6 @@ AccountTrackerService::~AccountTrackerSe 4597@@ -152,9 +151,6 @@ AccountTrackerService::~AccountTrackerSe
4623 4598
4624 // static 4599 // static
4625 void AccountTrackerService::RegisterPrefs(PrefRegistrySimple* registry) { 4600 void AccountTrackerService::RegisterPrefs(PrefRegistrySimple* registry) {
@@ -4629,7 +4604,7 @@
4629 } 4604 }
4630 4605
4631 void AccountTrackerService::Initialize(PrefService* pref_service, 4606 void AccountTrackerService::Initialize(PrefService* pref_service,
4632@@ -463,14 +459,12 @@ AccountTrackerService::ComputeNewMigrati 4607@@ -455,14 +451,12 @@ AccountTrackerService::ComputeNewMigrati
4633 4608
4634 void AccountTrackerService::SetMigrationState(AccountIdMigrationState state) { 4609 void AccountTrackerService::SetMigrationState(AccountIdMigrationState state) {
4635 DCHECK(state != MIGRATION_DONE || AreAllAccountsMigrated()); 4610 DCHECK(state != MIGRATION_DONE || AreAllAccountsMigrated());
@@ -4645,7 +4620,7 @@
4645 } 4620 }
4646 4621
4647 base::FilePath AccountTrackerService::GetImagePathFor( 4622 base::FilePath AccountTrackerService::GetImagePathFor(
4648@@ -527,27 +521,6 @@ void AccountTrackerService::OnAccountIma 4623@@ -519,24 +513,7 @@ void AccountTrackerService::OnAccountIma
4649 const CoreAccountId& account_id, 4624 const CoreAccountId& account_id,
4650 const std::string& image_url_with_size, 4625 const std::string& image_url_with_size,
4651 bool success) { 4626 bool success) {
@@ -4654,15 +4629,12 @@
4654- 4629-
4655- base::DictionaryValue* dict = nullptr; 4630- base::DictionaryValue* dict = nullptr;
4656- ListPrefUpdate update(pref_service_, prefs::kAccountInfo); 4631- ListPrefUpdate update(pref_service_, prefs::kAccountInfo);
4657- for (size_t i = 0; i < update->GetListDeprecated().size(); 4632- for (size_t i = 0; i < update->GetList().size(); ++i, dict = nullptr) {
4658- ++i, dict = nullptr) { 4633- if (update->GetDictionary(i, &dict)) {
4659- base::Value& dict_value = update->GetListDeprecated()[i]; 4634- std::string value;
4660- if (dict_value.is_dict()) { 4635- if (dict->GetString(kAccountKeyPath, &value) &&
4661- dict = static_cast<base::DictionaryValue*>(&dict_value); 4636- value == account_id.ToString())
4662- const std::string* account_key = dict->FindStringKey(kAccountKeyPath);
4663- if (account_key && *account_key == account_id.ToString()) {
4664- break; 4637- break;
4665- }
4666- } 4638- }
4667- } 4639- }
4668- 4640-
@@ -4670,158 +4642,67 @@
4670- return; 4642- return;
4671- } 4643- }
4672- dict->SetString(kLastDownloadedImageURLWithSizePath, image_url_with_size); 4644- dict->SetString(kLastDownloadedImageURLWithSizePath, image_url_with_size);
4645+ return;
4673 } 4646 }
4674 4647
4675 void AccountTrackerService::RemoveAccountImageFromDisk( 4648 void AccountTrackerService::RemoveAccountImageFromDisk(
4676@@ -559,162 +532,16 @@ void AccountTrackerService::RemoveAccoun 4649@@ -548,11 +525,10 @@ void AccountTrackerService::RemoveAccoun
4677 } 4650 }
4678 4651
4679 void AccountTrackerService::LoadFromPrefs() { 4652 void AccountTrackerService::LoadFromPrefs() {
4680- const base::Value* list = pref_service_->GetList(prefs::kAccountInfo); 4653- const base::ListValue* list = pref_service_->GetList(prefs::kAccountInfo);
4681- std::set<CoreAccountId> to_remove; 4654 std::set<CoreAccountId> to_remove;
4682- for (size_t i = 0; i < list->GetListDeprecated().size(); ++i) { 4655- for (size_t i = 0; i < list->GetList().size(); ++i) {
4683- const base::Value& dict_value = list->GetListDeprecated()[i]; 4656+ for (size_t i = 0; false; ++i) {
4684- if (dict_value.is_dict()) { 4657 const base::DictionaryValue* dict = nullptr;
4685- const base::DictionaryValue& dict = 4658- if (list->GetDictionary(i, &dict)) {
4686- base::Value::AsDictionaryValue(dict_value); 4659+ if (false) {
4687- if (const std::string* account_key = 4660 std::string value;
4688- dict.FindStringKey(kAccountKeyPath)) { 4661 if (dict->GetString(kAccountKeyPath, &value)) {
4689- // Ignore incorrectly persisted non-canonical account ids. 4662 // Ignore incorrectly persisted non-canonical account ids.
4690- if (account_key->find('@') != std::string::npos && 4663@@ -588,14 +564,6 @@ void AccountTrackerService::LoadFromPref
4691- *account_key != gaia::CanonicalizeEmail(*account_key)) { 4664 account_info.is_child_account = is_child_status.value()
4692- to_remove.insert(CoreAccountId::FromString(*account_key)); 4665 ? signin::Tribool::kTrue
4693- continue; 4666 : signin::Tribool::kFalse;
4694- }
4695-
4696- CoreAccountId account_id = CoreAccountId::FromString(*account_key);
4697- StartTrackingAccount(account_id);
4698- AccountInfo& account_info = accounts_[account_id];
4699-
4700- GetString(dict, kAccountGaiaPath, account_info.gaia);
4701- GetString(dict, kAccountEmailPath, account_info.email);
4702- GetString(dict, kAccountHostedDomainPath, account_info.hosted_domain);
4703- GetString(dict, kAccountFullNamePath, account_info.full_name);
4704- GetString(dict, kAccountGivenNamePath, account_info.given_name);
4705- GetString(dict, kAccountLocalePath, account_info.locale);
4706- GetString(dict, kAccountPictureURLPath, account_info.picture_url);
4707- GetString(dict, kLastDownloadedImageURLWithSizePath,
4708- account_info.last_downloaded_image_url_with_size);
4709-
4710- if (absl::optional<bool> is_child_status =
4711- dict.FindBoolKey(kDeprecatedChildStatusPath)) {
4712- account_info.is_child_account = is_child_status.value()
4713- ? signin::Tribool::kTrue
4714- : signin::Tribool::kFalse;
4715- // Migrate to kAccountChildAttributePath. 4667- // Migrate to kAccountChildAttributePath.
4716- ListPrefUpdate update(pref_service_, prefs::kAccountInfo); 4668- ListPrefUpdate update(pref_service_, prefs::kAccountInfo);
4717- base::Value* update_dict = &update->GetListDeprecated()[i]; 4669- base::DictionaryValue* update_dict = nullptr;
4718- DCHECK(update_dict->is_dict()); 4670- update->GetDictionary(i, &update_dict);
4671- DCHECK(update_dict);
4719- SetAccountCapabilityPath(update_dict, kAccountChildAttributePath, 4672- SetAccountCapabilityPath(update_dict, kAccountChildAttributePath,
4720- account_info.is_child_account); 4673- account_info.is_child_account);
4721- update_dict->RemoveKey(kDeprecatedChildStatusPath); 4674- update_dict->RemoveKey(kDeprecatedChildStatusPath);
4722- } else { 4675 } else {
4723- account_info.is_child_account = 4676 account_info.is_child_account =
4724- FindAccountCapabilityPath(dict, kAccountChildAttributePath); 4677 FindAccountCapabilityPath(*dict, kAccountChildAttributePath);
4725- } 4678@@ -654,13 +622,11 @@ void AccountTrackerService::LoadFromPref
4726-
4727- absl::optional<bool> is_under_advanced_protection =
4728- dict.FindBoolKey(kAdvancedProtectionAccountStatusPath);
4729- if (is_under_advanced_protection.has_value()) {
4730- account_info.is_under_advanced_protection =
4731- is_under_advanced_protection.value();
4732- }
4733-
4734- switch (FindAccountCapabilityPath(
4735- dict, kCanOfferExtendedChromeSyncPromosCapabilityPrefsPath)) {
4736- case signin::Tribool::kUnknown:
4737- break;
4738- case signin::Tribool::kTrue:
4739- account_info.capabilities.set_can_offer_extended_chrome_sync_promos(
4740- true);
4741- break;
4742- case signin::Tribool::kFalse:
4743- account_info.capabilities.set_can_offer_extended_chrome_sync_promos(
4744- false);
4745- break;
4746- }
4747-
4748- if (!account_info.gaia.empty())
4749- NotifyAccountUpdated(account_info);
4750- }
4751- }
4752- }
4753-
4754- // Remove any obsolete prefs.
4755- for (auto account_id : to_remove) {
4756- AccountInfo account_info;
4757- account_info.account_id = account_id;
4758- RemoveFromPrefs(account_info);
4759- RemoveAccountImageFromDisk(account_id);
4760- }
4761-
4762- if (GetMigrationState() != MIGRATION_DONE) {
4763- const AccountIdMigrationState new_state = ComputeNewMigrationState();
4764- SetMigrationState(new_state);
4765-
4766- if (new_state == MIGRATION_IN_PROGRESS) {
4767- MigrateToGaiaId();
4768- }
4769- }
4770-
4771- DCHECK(GetMigrationState() != MIGRATION_DONE || AreAllAccountsMigrated());
4772- UMA_HISTOGRAM_ENUMERATION("Signin.AccountTracker.GaiaIdMigrationState",
4773- GetMigrationState(), NUM_MIGRATION_STATES);
4774-
4775- UMA_HISTOGRAM_COUNTS_100("Signin.AccountTracker.CountOfLoadedAccounts",
4776- accounts_.size());
4777 } 4679 }
4778 4680
4779 void AccountTrackerService::SaveToPrefs(const AccountInfo& account_info) { 4681 void AccountTrackerService::SaveToPrefs(const AccountInfo& account_info) {
4780- if (!pref_service_) 4682- if (!pref_service_)
4781- return; 4683- return;
4782- 4684+ return;
4783- base::DictionaryValue* dict = nullptr; 4685
4686 base::DictionaryValue* dict = nullptr;
4784- ListPrefUpdate update(pref_service_, prefs::kAccountInfo); 4687- ListPrefUpdate update(pref_service_, prefs::kAccountInfo);
4785- for (size_t i = 0; i < update->GetListDeprecated().size(); 4688- for (size_t i = 0; i < update->GetList().size(); ++i, dict = nullptr) {
4786- ++i, dict = nullptr) { 4689- if (update->GetDictionary(i, &dict)) {
4787- base::Value& dict_value = update->GetListDeprecated()[i]; 4690+ if (false) {
4788- if (dict_value.is_dict()) { 4691+ while (false) {
4789- dict = static_cast<base::DictionaryValue*>(&dict_value); 4692 std::string value;
4790- const std::string* account_key = dict->FindStringKey(kAccountKeyPath); 4693 if (dict->GetString(kAccountKeyPath, &value) &&
4791- if (account_key && *account_key == account_info.account_id.ToString()) { 4694 value == account_info.account_id.ToString())
4792- break; 4695@@ -670,9 +636,6 @@ void AccountTrackerService::SaveToPrefs(
4793- } 4696
4794- } 4697 if (!dict) {
4795- } 4698 dict = new base::DictionaryValue();
4796- 4699- update->Append(base::WrapUnique(dict));
4797- if (!dict) { 4700- // |dict| is invalidated at this point, so it needs to be reset.
4798- update->Append(base::Value(base::Value::Type::DICTIONARY)); 4701- update->GetDictionary(update->GetList().size() - 1, &dict);
4799- base::Value& dict_value = update->GetListDeprecated().back(); 4702 dict->SetString(kAccountKeyPath, account_info.account_id.ToString());
4800- DCHECK(dict_value.is_dict()); 4703 }
4801- dict = static_cast<base::DictionaryValue*>(&dict_value);
4802- dict->SetString(kAccountKeyPath, account_info.account_id.ToString());
4803- }
4804-
4805- dict->SetString(kAccountEmailPath, account_info.email);
4806- dict->SetString(kAccountGaiaPath, account_info.gaia);
4807- dict->SetString(kAccountHostedDomainPath, account_info.hosted_domain);
4808- dict->SetString(kAccountFullNamePath, account_info.full_name);
4809- dict->SetString(kAccountGivenNamePath, account_info.given_name);
4810- dict->SetString(kAccountLocalePath, account_info.locale);
4811- dict->SetString(kAccountPictureURLPath, account_info.picture_url);
4812- SetAccountCapabilityPath(dict, kAccountChildAttributePath,
4813- account_info.is_child_account);
4814- dict->SetBoolean(kAdvancedProtectionAccountStatusPath,
4815- account_info.is_under_advanced_protection);
4816- // |kLastDownloadedImageURLWithSizePath| should only be set after the GAIA
4817- // picture is successufly saved to disk. Otherwise, there is no guarantee that
4818- // |kLastDownloadedImageURLWithSizePath| matches the picture on disk.
4819- SetAccountCapabilityPath(
4820- dict, kCanOfferExtendedChromeSyncPromosCapabilityPrefsPath,
4821- account_info.capabilities.can_offer_extended_chrome_sync_promos());
4822 }
4823 4704
4824 void AccountTrackerService::RemoveFromPrefs(const AccountInfo& account_info) { 4705@@ -699,14 +662,7 @@ void AccountTrackerService::RemoveFromPr
4825 if (!pref_service_) 4706 if (!pref_service_)
4826 return; 4707 return;
4827 4708
@@ -4836,9 +4717,9 @@
4836 } 4717 }
4837 4718
4838 CoreAccountId AccountTrackerService::PickAccountIdForAccount( 4719 CoreAccountId AccountTrackerService::PickAccountIdForAccount(
4839--- a/components/signin/internal/identity_manager/account_tracker_service.h 4720--- components/signin/internal/identity_manager/account_tracker_service.h.orig
4840+++ b/components/signin/internal/identity_manager/account_tracker_service.h 4721+++ components/signin/internal/identity_manager/account_tracker_service.h
4841@@ -235,6 +235,8 @@ class AccountTrackerService { 4722@@ -236,6 +236,8 @@ class AccountTrackerService {
4842 AccountInfoCallback on_account_updated_callback_; 4723 AccountInfoCallback on_account_updated_callback_;
4843 AccountInfoCallback on_account_removed_callback_; 4724 AccountInfoCallback on_account_removed_callback_;
4844 4725
@@ -4847,8 +4728,8 @@
4847 // Task runner used for file operations on avatar images. 4728 // Task runner used for file operations on avatar images.
4848 scoped_refptr<base::SequencedTaskRunner> image_storage_task_runner_; 4729 scoped_refptr<base::SequencedTaskRunner> image_storage_task_runner_;
4849 4730
4850--- a/components/signin/internal/identity_manager/account_tracker_service_unittest.cc 4731--- components/signin/internal/identity_manager/account_tracker_service_unittest.cc.orig
4851+++ b/components/signin/internal/identity_manager/account_tracker_service_unittest.cc 4732+++ components/signin/internal/identity_manager/account_tracker_service_unittest.cc
4852@@ -26,7 +26,6 @@ 4733@@ -26,7 +26,6 @@
4853 #include "components/signin/internal/identity_manager/account_tracker_service.h" 4734 #include "components/signin/internal/identity_manager/account_tracker_service.h"
4854 #include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service.h" 4735 #include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service.h"
@@ -4857,8 +4738,8 @@
4857 #include "components/signin/public/base/signin_switches.h" 4738 #include "components/signin/public/base/signin_switches.h"
4858 #include "components/signin/public/base/test_signin_client.h" 4739 #include "components/signin/public/base/test_signin_client.h"
4859 #include "components/signin/public/identity_manager/account_capabilities.h" 4740 #include "components/signin/public/identity_manager/account_capabilities.h"
4860--- a/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc 4741--- components/signin/internal/identity_manager/gaia_cookie_manager_service.cc.orig
4861+++ b/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc 4742+++ components/signin/internal/identity_manager/gaia_cookie_manager_service.cc
4862@@ -29,7 +29,6 @@ 4743@@ -29,7 +29,6 @@
4863 #include "components/signin/internal/identity_manager/ubertoken_fetcher_impl.h" 4744 #include "components/signin/internal/identity_manager/ubertoken_fetcher_impl.h"
4864 #include "components/signin/public/base/signin_buildflags.h" 4745 #include "components/signin/public/base/signin_buildflags.h"
@@ -4867,7 +4748,7 @@
4867 #include "components/signin/public/identity_manager/set_accounts_in_cookie_result.h" 4748 #include "components/signin/public/identity_manager/set_accounts_in_cookie_result.h"
4868 #include "google_apis/gaia/gaia_constants.h" 4749 #include "google_apis/gaia/gaia_constants.h"
4869 #include "google_apis/gaia/gaia_urls.h" 4750 #include "google_apis/gaia/gaia_urls.h"
4870@@ -451,9 +450,7 @@ GaiaCookieManagerService::GaiaCookieMana 4751@@ -456,9 +455,7 @@ GaiaCookieManagerService::GaiaCookieMana
4871 listAccountsUnexpectedServerResponseRetried_(false), 4752 listAccountsUnexpectedServerResponseRetried_(false),
4872 external_cc_result_fetched_(false), 4753 external_cc_result_fetched_(false),
4873 list_accounts_stale_(true) { 4754 list_accounts_stale_(true) {
@@ -4878,7 +4759,7 @@
4878 4759
4879 if (!gaia_cookie_last_list_accounts_data.empty()) { 4760 if (!gaia_cookie_last_list_accounts_data.empty()) {
4880 if (!gaia::ParseListAccountsData(gaia_cookie_last_list_accounts_data, 4761 if (!gaia::ParseListAccountsData(gaia_cookie_last_list_accounts_data,
4881@@ -477,8 +474,6 @@ GaiaCookieManagerService::~GaiaCookieMan 4762@@ -482,8 +479,6 @@ GaiaCookieManagerService::~GaiaCookieMan
4882 4763
4883 // static 4764 // static
4884 void GaiaCookieManagerService::RegisterPrefs(PrefRegistrySimple* registry) { 4765 void GaiaCookieManagerService::RegisterPrefs(PrefRegistrySimple* registry) {
@@ -4887,7 +4768,7 @@
4887 } 4768 }
4888 4769
4889 void GaiaCookieManagerService::InitCookieListener() { 4770 void GaiaCookieManagerService::InitCookieListener() {
4890@@ -896,16 +891,12 @@ void GaiaCookieManagerService::OnListAcc 4771@@ -906,16 +901,12 @@ void GaiaCookieManagerService::OnListAcc
4891 &signed_out_accounts_)) { 4772 &signed_out_accounts_)) {
4892 listed_accounts_.clear(); 4773 listed_accounts_.clear();
4893 signed_out_accounts_.clear(); 4774 signed_out_accounts_.clear();
@@ -4904,9 +4785,9 @@
4904 RecordListAccountsFailure(GoogleServiceAuthError::NONE); 4785 RecordListAccountsFailure(GoogleServiceAuthError::NONE);
4905 4786
4906 InitializeListedAccountsIds(); 4787 InitializeListedAccountsIds();
4907--- a/components/signin/internal/identity_manager/gaia_cookie_manager_service_unittest.cc 4788--- components/signin/internal/identity_manager/gaia_cookie_manager_service_unittest.cc.orig
4908+++ b/components/signin/internal/identity_manager/gaia_cookie_manager_service_unittest.cc 4789+++ components/signin/internal/identity_manager/gaia_cookie_manager_service_unittest.cc
4909@@ -24,7 +24,6 @@ 4790@@ -25,7 +25,6 @@
4910 #include "components/prefs/testing_pref_service.h" 4791 #include "components/prefs/testing_pref_service.h"
4911 #include "components/signin/internal/identity_manager/account_tracker_service.h" 4792 #include "components/signin/internal/identity_manager/account_tracker_service.h"
4912 #include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service.h" 4793 #include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service.h"
@@ -4914,8 +4795,8 @@
4914 #include "components/signin/public/base/test_signin_client.h" 4795 #include "components/signin/public/base/test_signin_client.h"
4915 #include "google_apis/gaia/gaia_constants.h" 4796 #include "google_apis/gaia/gaia_constants.h"
4916 #include "google_apis/gaia/gaia_urls.h" 4797 #include "google_apis/gaia/gaia_urls.h"
4917--- a/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc 4798--- components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc.orig
4918+++ b/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
4919@@ -17,7 +17,6 @@ 4800@@ -17,7 +17,6 @@
4920 #include "components/prefs/pref_service.h" 4801 #include "components/prefs/pref_service.h"
4921 #include "components/signin/public/base/signin_client.h" 4802 #include "components/signin/public/base/signin_client.h"
@@ -4970,8 +4851,8 @@
4970- client_->GetPrefs()->SetBoolean(prefs::kTokenServiceDiceCompatible, true); 4851- client_->GetPrefs()->SetBoolean(prefs::kTokenServiceDiceCompatible, true);
4971 } 4852 }
4972 } 4853 }
4973--- a/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc 4854--- components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc.orig
4974+++ b/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
4975@@ -25,7 +25,6 @@ 4856@@ -25,7 +25,6 @@
4976 #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h" 4857 #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h"
4977 #include "components/signin/public/base/account_consistency_method.h" 4858 #include "components/signin/public/base/account_consistency_method.h"
@@ -4980,8 +4861,8 @@
4980 #include "components/signin/public/base/test_signin_client.h" 4861 #include "components/signin/public/base/test_signin_client.h"
4981 #include "components/signin/public/identity_manager/account_info.h" 4862 #include "components/signin/public/identity_manager/account_info.h"
4982 #include "components/signin/public/webdata/token_web_data.h" 4863 #include "components/signin/public/webdata/token_web_data.h"
4983--- a/components/signin/internal/identity_manager/primary_account_manager.cc 4864--- components/signin/internal/identity_manager/primary_account_manager.cc.orig
4984+++ b/components/signin/internal/identity_manager/primary_account_manager.cc 4865+++ components/signin/internal/identity_manager/primary_account_manager.cc
4985@@ -22,7 +22,6 @@ 4866@@ -22,7 +22,6 @@
4986 #include "components/signin/public/base/account_consistency_method.h" 4867 #include "components/signin/public/base/account_consistency_method.h"
4987 #include "components/signin/public/base/signin_client.h" 4868 #include "components/signin/public/base/signin_client.h"
@@ -5056,7 +4937,7 @@
5056 CoreAccountId account_id = CoreAccountId::FromString(pref_account_id); 4937 CoreAccountId account_id = CoreAccountId::FromString(pref_account_id);
5057 CoreAccountInfo account_info = 4938 CoreAccountInfo account_info =
5058 account_tracker_service_->GetAccountInfo(account_id); 4939 account_tracker_service_->GetAccountInfo(account_id);
5059@@ -182,8 +148,7 @@ void PrimaryAccountManager::SetSyncPrima 4940@@ -166,8 +132,7 @@ void PrimaryAccountManager::SetSyncPrima
5060 4941
5061 #if DCHECK_IS_ON() 4942 #if DCHECK_IS_ON()
5062 { 4943 {
@@ -5066,7 +4947,7 @@
5066 bool consented_to_sync = 4947 bool consented_to_sync =
5067 client_->GetPrefs()->GetBoolean(prefs::kGoogleServicesConsentedToSync); 4948 client_->GetPrefs()->GetBoolean(prefs::kGoogleServicesConsentedToSync);
5068 4949
5069@@ -199,10 +164,6 @@ void PrimaryAccountManager::SetSyncPrima 4950@@ -183,10 +148,6 @@ void PrimaryAccountManager::SetSyncPrima
5070 // Go ahead and update the last signed in account info here as well. Once a 4951 // Go ahead and update the last signed in account info here as well. Once a
5071 // user is signed in the corresponding preferences should match. Doing it here 4952 // user is signed in the corresponding preferences should match. Doing it here
5072 // as opposed to on signin allows us to catch the upgrade scenario. 4953 // as opposed to on signin allows us to catch the upgrade scenario.
@@ -5077,7 +4958,7 @@
5077 4958
5078 // Commit primary sync account info immediately so that it does not get lost 4959 // Commit primary sync account info immediately so that it does not get lost
5079 // if Chrome crashes before the next commit interval. 4960 // if Chrome crashes before the next commit interval.
5080@@ -216,20 +177,11 @@ void PrimaryAccountManager::SetPrimaryAc 4961@@ -200,20 +161,11 @@ void PrimaryAccountManager::SetPrimaryAc
5081 4962
5082 PrefService* prefs = client_->GetPrefs(); 4963 PrefService* prefs = client_->GetPrefs();
5083 const std::string& account_id = primary_account_info_.account_id.ToString(); 4964 const std::string& account_id = primary_account_info_.account_id.ToString();
@@ -5099,9 +4980,9 @@
5099 if (primary_account_info().account_id.empty()) { 4980 if (primary_account_info().account_id.empty()) {
5100 DCHECK(!consented_pref); 4981 DCHECK(!consented_pref);
5101 return false; 4982 return false;
5102--- a/components/signin/internal/identity_manager/primary_account_manager_unittest.cc 4983--- components/signin/internal/identity_manager/primary_account_manager_unittest.cc.orig
5103+++ b/components/signin/internal/identity_manager/primary_account_manager_unittest.cc 4984+++ components/signin/internal/identity_manager/primary_account_manager_unittest.cc
5104@@ -25,7 +25,6 @@ 4985@@ -24,7 +24,6 @@
5105 #include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service_delegate.h" 4986 #include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service_delegate.h"
5106 #include "components/signin/internal/identity_manager/primary_account_policy_manager.h" 4987 #include "components/signin/internal/identity_manager/primary_account_policy_manager.h"
5107 #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h" 4988 #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h"
@@ -5109,8 +4990,8 @@
5109 #include "components/signin/public/base/signin_switches.h" 4990 #include "components/signin/public/base/signin_switches.h"
5110 #include "components/signin/public/base/test_signin_client.h" 4991 #include "components/signin/public/base/test_signin_client.h"
5111 #include "components/sync_preferences/testing_pref_service_syncable.h" 4992 #include "components/sync_preferences/testing_pref_service_syncable.h"
5112--- a/components/signin/internal/identity_manager/primary_account_mutator_impl.cc 4993--- components/signin/internal/identity_manager/primary_account_mutator_impl.cc.orig
5113+++ b/components/signin/internal/identity_manager/primary_account_mutator_impl.cc 4994+++ components/signin/internal/identity_manager/primary_account_mutator_impl.cc
5114@@ -14,7 +14,6 @@ 4995@@ -14,7 +14,6 @@
5115 #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h" 4996 #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h"
5116 #include "components/signin/public/base/signin_buildflags.h" 4997 #include "components/signin/public/base/signin_buildflags.h"
@@ -5128,8 +5009,8 @@
5128 #if BUILDFLAG(IS_CHROMEOS_LACROS) 5009 #if BUILDFLAG(IS_CHROMEOS_LACROS)
5129 // Check that `prefs::kSigninAllowed` has not been set to false in a context 5010 // Check that `prefs::kSigninAllowed` has not been set to false in a context
5130 // where Lacros wants to set a Primary Account. Lacros doesn't offer account 5011 // where Lacros wants to set a Primary Account. Lacros doesn't offer account
5131--- a/components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc 5012--- components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc.orig
5132+++ b/components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc 5013+++ components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc
5133@@ -10,7 +10,6 @@ 5014@@ -10,7 +10,6 @@
5134 #include "components/signin/internal/identity_manager/primary_account_manager.h" 5015 #include "components/signin/internal/identity_manager/primary_account_manager.h"
5135 #include "components/signin/public/base/signin_client.h" 5016 #include "components/signin/public/base/signin_client.h"
@@ -5157,8 +5038,8 @@
5157 5038
5158 CoreAccountInfo account_info = primary_account_manager->GetPrimaryAccountInfo( 5039 CoreAccountInfo account_info = primary_account_manager->GetPrimaryAccountInfo(
5159 signin::ConsentLevel::kSync); 5040 signin::ConsentLevel::kSync);
5160--- a/components/signin/internal/identity_manager/primary_account_policy_manager_impl.h 5041--- components/signin/internal/identity_manager/primary_account_policy_manager_impl.h.orig
5161+++ b/components/signin/internal/identity_manager/primary_account_policy_manager_impl.h 5042+++ components/signin/internal/identity_manager/primary_account_policy_manager_impl.h
5162@@ -56,9 +56,6 @@ class PrimaryAccountPolicyManagerImpl : 5043@@ -56,9 +56,6 @@ class PrimaryAccountPolicyManagerImpl :
5163 // profile-specific local prefs (like kGoogleServicesUsernamePattern). 5044 // profile-specific local prefs (like kGoogleServicesUsernamePattern).
5164 PrefChangeRegistrar local_state_pref_registrar_; 5045 PrefChangeRegistrar local_state_pref_registrar_;
@@ -5169,8 +5050,8 @@
5169 base::WeakPtrFactory<PrimaryAccountPolicyManagerImpl> weak_pointer_factory_{ 5050 base::WeakPtrFactory<PrimaryAccountPolicyManagerImpl> weak_pointer_factory_{
5170 this}; 5051 this};
5171 }; 5052 };
5172--- a/components/signin/internal/identity_manager/primary_account_policy_manager_impl_unittest.cc 5053--- components/signin/internal/identity_manager/primary_account_policy_manager_impl_unittest.cc.orig
5173+++ b/components/signin/internal/identity_manager/primary_account_policy_manager_impl_unittest.cc 5054+++ components/signin/internal/identity_manager/primary_account_policy_manager_impl_unittest.cc
5174@@ -15,7 +15,6 @@ 5055@@ -15,7 +15,6 @@
5175 #include "components/signin/internal/identity_manager/primary_account_policy_manager_impl.h" 5056 #include "components/signin/internal/identity_manager/primary_account_policy_manager_impl.h"
5176 #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h" 5057 #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h"
@@ -5179,8 +5060,8 @@
5179 #include "components/signin/public/base/test_signin_client.h" 5060 #include "components/signin/public/base/test_signin_client.h"
5180 #include "components/sync_preferences/testing_pref_service_syncable.h" 5061 #include "components/sync_preferences/testing_pref_service_syncable.h"
5181 #include "testing/gtest/include/gtest/gtest.h" 5062 #include "testing/gtest/include/gtest/gtest.h"
5182--- a/components/signin/internal/identity_manager/profile_oauth2_token_service.cc 5063--- components/signin/internal/identity_manager/profile_oauth2_token_service.cc.orig
5183+++ b/components/signin/internal/identity_manager/profile_oauth2_token_service.cc 5064+++ components/signin/internal/identity_manager/profile_oauth2_token_service.cc
5184@@ -12,7 +12,6 @@ 5065@@ -12,7 +12,6 @@
5185 #include "components/prefs/pref_registry_simple.h" 5066 #include "components/prefs/pref_registry_simple.h"
5186 #include "components/signin/internal/identity_manager/profile_oauth2_token_service_delegate.h" 5067 #include "components/signin/internal/identity_manager/profile_oauth2_token_service_delegate.h"
@@ -5198,9 +5079,9 @@
5198 } 5079 }
5199 5080
5200 ProfileOAuth2TokenServiceDelegate* ProfileOAuth2TokenService::GetDelegate() { 5081 ProfileOAuth2TokenServiceDelegate* ProfileOAuth2TokenService::GetDelegate() {
5201--- a/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc 5082--- components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc.orig
5202+++ b/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
5203@@ -24,7 +24,6 @@ 5084@@ -25,7 +25,6 @@
5204 #include "components/account_manager_core/mock_account_manager_facade.h" 5085 #include "components/account_manager_core/mock_account_manager_facade.h"
5205 #include "components/signin/internal/identity_manager/account_tracker_service.h" 5086 #include "components/signin/internal/identity_manager/account_tracker_service.h"
5206 #include "components/signin/internal/identity_manager/profile_oauth2_token_service_observer.h" 5087 #include "components/signin/internal/identity_manager/profile_oauth2_token_service_observer.h"
@@ -5208,9 +5089,9 @@
5208 #include "components/signin/public/base/test_signin_client.h" 5089 #include "components/signin/public/base/test_signin_client.h"
5209 #include "components/signin/public/identity_manager/account_info.h" 5090 #include "components/signin/public/identity_manager/account_info.h"
5210 #include "components/sync_preferences/testing_pref_service_syncable.h" 5091 #include "components/sync_preferences/testing_pref_service_syncable.h"
5211--- a/components/signin/public/base/BUILD.gn 5092--- components/signin/public/base/BUILD.gn.orig
5212+++ b/components/signin/public/base/BUILD.gn 5093+++ components/signin/public/base/BUILD.gn
5213@@ -35,8 +35,6 @@ static_library("base") { 5094@@ -34,8 +34,6 @@ static_library("base") {
5214 "signin_client.h", 5095 "signin_client.h",
5215 "signin_metrics.cc", 5096 "signin_metrics.cc",
5216 "signin_metrics.h", 5097 "signin_metrics.h",
@@ -5219,8 +5100,8 @@
5219 "signin_switches.cc", 5100 "signin_switches.cc",
5220 "signin_switches.h", 5101 "signin_switches.h",
5221 ] 5102 ]
5222--- a/components/signin/public/base/device_id_helper.cc 5103--- components/signin/public/base/device_id_helper.cc.orig
5223+++ b/components/signin/public/base/device_id_helper.cc 5104+++ components/signin/public/base/device_id_helper.cc
5224@@ -9,7 +9,6 @@ 5105@@ -9,7 +9,6 @@
5225 #include "base/guid.h" 5106 #include "base/guid.h"
5226 #include "build/chromeos_buildflags.h" 5107 #include "build/chromeos_buildflags.h"
@@ -5265,8 +5146,8 @@
5265 } 5146 }
5266 5147
5267 #endif 5148 #endif
5268--- a/components/signin/public/base/device_id_helper_unittest.cc 5149--- components/signin/public/base/device_id_helper_unittest.cc.orig
5269+++ b/components/signin/public/base/device_id_helper_unittest.cc 5150+++ components/signin/public/base/device_id_helper_unittest.cc
5270@@ -8,7 +8,6 @@ 5151@@ -8,7 +8,6 @@
5271 5152
5272 #include "build/build_config.h" 5153 #include "build/build_config.h"
@@ -5316,8 +5197,8 @@
5316 } 5197 }
5317 5198
5318 #endif 5199 #endif
5319--- a/components/signin/public/identity_manager/identity_utils.cc 5200--- components/signin/public/identity_manager/identity_utils.cc.orig
5320+++ b/components/signin/public/identity_manager/identity_utils.cc 5201+++ components/signin/public/identity_manager/identity_utils.cc
5321@@ -11,7 +11,6 @@ 5202@@ -11,7 +11,6 @@
5322 #include "base/strings/string_util.h" 5203 #include "base/strings/string_util.h"
5323 #include "base/strings/utf_string_conversions.h" 5204 #include "base/strings/utf_string_conversions.h"
@@ -5336,8 +5217,8 @@
5336 } 5217 }
5337 5218
5338 } // namespace signin 5219 } // namespace signin
5339--- a/components/signin/public/identity_manager/identity_utils_unittest.cc 5220--- components/signin/public/identity_manager/identity_utils_unittest.cc.orig
5340+++ b/components/signin/public/identity_manager/identity_utils_unittest.cc 5221+++ components/signin/public/identity_manager/identity_utils_unittest.cc
5341@@ -7,7 +7,6 @@ 5222@@ -7,7 +7,6 @@
5342 #include "components/prefs/pref_registry_simple.h" 5223 #include "components/prefs/pref_registry_simple.h"
5343 #include "components/prefs/pref_service.h" 5224 #include "components/prefs/pref_service.h"
@@ -5346,19 +5227,19 @@
5346 #include "testing/gtest/include/gtest/gtest.h" 5227 #include "testing/gtest/include/gtest/gtest.h"
5347 5228
5348 namespace { 5229 namespace {
5349--- a/components/signin/public/identity_manager/primary_account_mutator_unittest.cc 5230--- components/signin/public/identity_manager/primary_account_mutator_unittest.cc.orig
5350+++ b/components/signin/public/identity_manager/primary_account_mutator_unittest.cc 5231+++ components/signin/public/identity_manager/primary_account_mutator_unittest.cc
5351@@ -16,7 +16,6 @@ 5232@@ -15,7 +15,6 @@
5352 #include "components/signin/public/base/consent_level.h" 5233 #include "build/chromeos_buildflags.h"
5353 #include "components/signin/public/base/signin_buildflags.h" 5234 #include "components/signin/public/base/signin_buildflags.h"
5354 #include "components/signin/public/base/signin_metrics.h" 5235 #include "components/signin/public/base/signin_metrics.h"
5355-#include "components/signin/public/base/signin_pref_names.h" 5236-#include "components/signin/public/base/signin_pref_names.h"
5237 #include "components/signin/public/identity_manager/consent_level.h"
5356 #include "components/signin/public/identity_manager/identity_test_environment.h" 5238 #include "components/signin/public/identity_manager/identity_test_environment.h"
5357 #include "components/signin/public/identity_manager/identity_test_utils.h" 5239 #include "components/signin/public/identity_manager/identity_test_utils.h"
5358 #include "components/sync_preferences/testing_pref_service_syncable.h" 5240--- tools/metrics/histograms/enums.xml.orig
5359--- a/tools/metrics/histograms/enums.xml 5241+++ tools/metrics/histograms/enums.xml
5360+++ b/tools/metrics/histograms/enums.xml 5242@@ -83754,7 +83754,6 @@ Full version information for the fingerp
5361@@ -88989,7 +88989,6 @@ Full version information for the fingerp
5362 <int value="3" label="kRestoreOnStartup"/> 5243 <int value="3" label="kRestoreOnStartup"/>
5363 <int value="4" label="kURLsToRestoreOnStartup"/> 5244 <int value="4" label="kURLsToRestoreOnStartup"/>
5364 <int value="5" label="extensions::pref_names::kExtensions"/> 5245 <int value="5" label="extensions::pref_names::kExtensions"/>
@@ -5366,7 +5247,7 @@
5366 <int value="7" label="kSearchProviderOverrides"/> 5247 <int value="7" label="kSearchProviderOverrides"/>
5367 <int value="8" label="kDefaultSearchProviderSearchURL (Obsolete 12/2016)"/> 5248 <int value="8" label="kDefaultSearchProviderSearchURL (Obsolete 12/2016)"/>
5368 <int value="9" label="kDefaultSearchProviderKeyword (Obsolete 12/2016)"/> 5249 <int value="9" label="kDefaultSearchProviderKeyword (Obsolete 12/2016)"/>
5369@@ -89004,10 +89003,7 @@ Full version information for the fingerp 5250@@ -83769,10 +83768,7 @@ Full version information for the fingerp
5370 <int value="18" label="kSafeBrowsingIncidentsSent"/> 5251 <int value="18" label="kSafeBrowsingIncidentsSent"/>
5371 <int value="19" label="kSwReporterPromptVersion"/> 5252 <int value="19" label="kSwReporterPromptVersion"/>
5372 <int value="20" label="kSwReporterPromptReason"/> 5253 <int value="20" label="kSwReporterPromptReason"/>
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 05:47:34 +0000