|
|
@@ -12,7 +12,7 @@
|
|
|
#include "components/url_formatter/url_fixer.h"
|
|
|
#include "components/user_prefs/user_prefs.h"
|
|
|
#include "components/visitedlink/browser/visitedlink_writer.h"
|
|
|
-@@ -458,8 +457,6 @@ void AwBrowserContext::RebuildTable(
|
|
|
+@@ -463,8 +462,6 @@ void AwBrowserContext::RebuildTable(
|
|
|
}
|
|
|
|
|
|
void AwBrowserContext::SetExtendedReportingAllowed(bool allowed) {
|
|
|
@@ -23,7 +23,7 @@
|
|
|
// TODO(amalova): Make sure NetworkContextParams is configured correctly when
|
|
|
--- a/chrome/app/settings_strings.grdp
|
|
|
+++ b/chrome/app/settings_strings.grdp
|
|
|
-@@ -1573,78 +1573,9 @@
|
|
|
+@@ -1591,78 +1591,9 @@
|
|
|
<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.">
|
|
|
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.
|
|
|
</message>
|
|
|
@@ -152,7 +152,7 @@
|
|
|
jboolean SigninManagerAndroid::IsSigninAllowedByPolicy(JNIEnv* env) const {
|
|
|
--- a/chrome/browser/android/signin/signin_manager_android.h
|
|
|
+++ b/chrome/browser/android/signin/signin_manager_android.h
|
|
|
-@@ -113,9 +113,6 @@ class SigninManagerAndroid : public Keye
|
|
|
+@@ -114,9 +114,6 @@ class SigninManagerAndroid : public Keye
|
|
|
|
|
|
Profile* const profile_ = nullptr;
|
|
|
|
|
|
@@ -233,7 +233,7 @@
|
|
|
user_manager::known_user::SetStringPref(
|
|
|
--- a/chrome/browser/chrome_content_browser_client.cc
|
|
|
+++ b/chrome/browser/chrome_content_browser_client.cc
|
|
|
-@@ -224,7 +224,6 @@
|
|
|
+@@ -221,7 +221,6 @@
|
|
|
#include "components/safe_browsing/core/browser/realtime/url_lookup_service.h"
|
|
|
#include "components/safe_browsing/core/browser/url_checker_delegate.h"
|
|
|
#include "components/safe_browsing/core/common/features.h"
|
|
|
@@ -289,7 +289,7 @@
|
|
|
|
|
|
--- a/chrome/browser/enterprise/connectors/connectors_service.cc
|
|
|
+++ b/chrome/browser/enterprise/connectors/connectors_service.cc
|
|
|
-@@ -35,7 +35,6 @@
|
|
|
+@@ -36,7 +36,6 @@
|
|
|
#include "components/policy/core/common/cloud/machine_level_user_cloud_policy_store.h"
|
|
|
#include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
|
|
|
#include "components/policy/core/common/policy_types.h"
|
|
|
@@ -297,7 +297,7 @@
|
|
|
#include "components/signin/public/identity_manager/consent_level.h"
|
|
|
#include "components/signin/public/identity_manager/identity_manager.h"
|
|
|
#include "components/user_prefs/user_prefs.h"
|
|
|
-@@ -389,8 +388,7 @@ std::string ConnectorsService::GetManage
|
|
|
+@@ -365,8 +364,7 @@ std::string ConnectorsService::GetManage
|
|
|
|
|
|
absl::optional<policy::PolicyScope> scope = absl::nullopt;
|
|
|
for (const char* scope_pref :
|
|
|
@@ -307,7 +307,7 @@
|
|
|
ConnectorScopePref(AnalysisConnector::FILE_DOWNLOADED),
|
|
|
ConnectorScopePref(AnalysisConnector::BULK_DATA_ENTRY),
|
|
|
ConnectorScopePref(ReportingConnector::SECURITY_EVENT)}) {
|
|
|
-@@ -429,20 +427,6 @@ std::string ConnectorsService::GetManage
|
|
|
+@@ -405,20 +403,6 @@ std::string ConnectorsService::GetManage
|
|
|
|
|
|
absl::optional<std::string> ConnectorsService::GetDMTokenForRealTimeUrlCheck()
|
|
|
const {
|
|
|
@@ -330,7 +330,7 @@
|
|
|
|
|
|
--- a/chrome/browser/enterprise/signals/context_info_fetcher.cc
|
|
|
+++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc
|
|
|
-@@ -176,12 +176,9 @@ void ContextInfoFetcher::Fetch(ContextIn
|
|
|
+@@ -181,12 +181,9 @@ void ContextInfoFetcher::Fetch(ContextIn
|
|
|
GetAnalysisConnectorProviders(enterprise_connectors::BULK_DATA_ENTRY);
|
|
|
info.on_security_event_providers = GetOnSecurityEventProviders();
|
|
|
info.browser_version = version_info::GetVersionNumber();
|
|
|
@@ -343,7 +343,7 @@
|
|
|
info.chrome_cleanup_enabled = GetChromeCleanupEnabled();
|
|
|
info.chrome_remote_desktop_app_blocked = GetChromeRemoteDesktopAppBlocked();
|
|
|
info.third_party_blocking_enabled = GetThirdPartyBLockingEnabled();
|
|
|
-@@ -227,25 +224,6 @@ std::vector<std::string> ContextInfoFetc
|
|
|
+@@ -232,25 +229,6 @@ std::vector<std::string> ContextInfoFetc
|
|
|
enterprise_connectors::ReportingConnector::SECURITY_EVENT);
|
|
|
}
|
|
|
|
|
|
@@ -358,18 +358,18 @@
|
|
|
-
|
|
|
- if (safe_browsing_enabled) {
|
|
|
- if (safe_browsing_enhanced_enabled)
|
|
|
-- return safe_browsing::ENHANCED_PROTECTION;
|
|
|
+- return safe_browsing::SafeBrowsingState::ENHANCED_PROTECTION;
|
|
|
- else
|
|
|
-- return safe_browsing::STANDARD_PROTECTION;
|
|
|
+- return safe_browsing::SafeBrowsingState::STANDARD_PROTECTION;
|
|
|
- } else {
|
|
|
-- return safe_browsing::NO_SAFE_BROWSING;
|
|
|
+- return safe_browsing::SafeBrowsingState::NO_SAFE_BROWSING;
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
absl::optional<bool> ContextInfoFetcher::GetThirdPartyBLockingEnabled() {
|
|
|
#if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
|
|
return g_browser_process->local_state()->GetBoolean(
|
|
|
-@@ -260,17 +238,6 @@ bool ContextInfoFetcher::GetBuiltInDnsCl
|
|
|
+@@ -265,17 +243,6 @@ bool ContextInfoFetcher::GetBuiltInDnsCl
|
|
|
prefs::kBuiltInDnsClientEnabled);
|
|
|
}
|
|
|
|
|
|
@@ -409,7 +409,7 @@
|
|
|
absl::optional<bool> chrome_cleanup_enabled;
|
|
|
bool chrome_remote_desktop_app_blocked;
|
|
|
absl::optional<bool> third_party_blocking_enabled;
|
|
|
-@@ -89,13 +87,8 @@ class ContextInfoFetcher {
|
|
|
+@@ -90,13 +88,8 @@ class ContextInfoFetcher {
|
|
|
|
|
|
std::vector<std::string> GetOnSecurityEventProviders();
|
|
|
|
|
|
@@ -425,20 +425,20 @@
|
|
|
absl::optional<bool> GetChromeCleanupEnabled();
|
|
|
--- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
|
|
|
+++ b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
|
|
|
-@@ -76,45 +76,10 @@ api::enterprise_reporting_private::Conte
|
|
|
+@@ -77,45 +77,10 @@ api::enterprise_reporting_private::Conte
|
|
|
info.browser_version = std::move(signals.browser_version);
|
|
|
info.built_in_dns_client_enabled = signals.built_in_dns_client_enabled;
|
|
|
|
|
|
- switch (signals.safe_browsing_protection_level) {
|
|
|
-- case safe_browsing::NO_SAFE_BROWSING:
|
|
|
+- case safe_browsing::SafeBrowsingState::NO_SAFE_BROWSING:
|
|
|
- info.safe_browsing_protection_level = extensions::api::
|
|
|
- enterprise_reporting_private::SAFE_BROWSING_LEVEL_DISABLED;
|
|
|
- break;
|
|
|
-- case safe_browsing::STANDARD_PROTECTION:
|
|
|
+- case safe_browsing::SafeBrowsingState::STANDARD_PROTECTION:
|
|
|
- info.safe_browsing_protection_level = extensions::api::
|
|
|
- enterprise_reporting_private::SAFE_BROWSING_LEVEL_STANDARD;
|
|
|
- break;
|
|
|
-- case safe_browsing::ENHANCED_PROTECTION:
|
|
|
+- case safe_browsing::SafeBrowsingState::ENHANCED_PROTECTION:
|
|
|
- info.safe_browsing_protection_level = extensions::api::
|
|
|
- enterprise_reporting_private::SAFE_BROWSING_LEVEL_ENHANCED;
|
|
|
- break;
|
|
|
@@ -526,7 +526,7 @@
|
|
|
{"searchSuggestEnabled", prefs::kSearchSuggestEnabled,
|
|
|
APIPermissionID::kPrivacy, APIPermissionID::kPrivacy},
|
|
|
{"spellingServiceEnabled", spellcheck::prefs::kSpellCheckUseSpellingService,
|
|
|
-@@ -842,18 +836,6 @@ ExtensionFunction::ResponseAction SetPre
|
|
|
+@@ -843,18 +837,6 @@ ExtensionFunction::ResponseAction SetPre
|
|
|
base::Value(browser_pref_value->GetBool()));
|
|
|
}
|
|
|
|
|
|
@@ -628,8 +628,8 @@
|
|
|
#include "components/search_engines/default_search_manager.h"
|
|
|
#include "components/spellcheck/browser/pref_names.h"
|
|
|
#include "components/translate/core/browser/translate_pref_names.h"
|
|
|
-@@ -285,16 +284,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
|
|
|
- }
|
|
|
+@@ -283,16 +282,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
|
|
|
+ settings_api::PrefType::PREF_TYPE_BOOLEAN;
|
|
|
|
|
|
// Security page
|
|
|
- (*s_allowlist)[::kGeneratedPasswordLeakDetectionPref] =
|
|
|
@@ -735,7 +735,7 @@
|
|
|
#include "content/public/browser/browser_context.h"
|
|
|
#include "content/public/browser/browser_thread.h"
|
|
|
#include "content/public/browser/network_service_instance.h"
|
|
|
-@@ -750,13 +749,6 @@ void ProfileNetworkContextService::Confi
|
|
|
+@@ -738,13 +737,6 @@ void ProfileNetworkContextService::Confi
|
|
|
network_context_params->enable_certificate_reporting = true;
|
|
|
network_context_params->enable_expect_ct_reporting = true;
|
|
|
|
|
|
@@ -904,9 +904,9 @@
|
|
|
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
|
|
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
|
|
@@ -82,12 +82,9 @@
|
|
|
- #include "components/policy/core/common/policy_pref_names.h"
|
|
|
#include "components/policy/core/common/schema.h"
|
|
|
#include "components/policy/policy_constants.h"
|
|
|
+ #include "components/proxy_config/proxy_policy_handler.h"
|
|
|
-#include "components/safe_browsing/core/common/safe_browsing_policy_handler.h"
|
|
|
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
|
|
|
#include "components/search_engines/default_search_policy_handler.h"
|
|
|
@@ -977,7 +977,7 @@
|
|
|
{ key::kAccessibilityImageLabelsEnabled,
|
|
|
prefs::kAccessibilityImageLabelsEnabled,
|
|
|
base::Value::Type::BOOLEAN },
|
|
|
-@@ -1590,8 +1560,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
+@@ -1600,8 +1570,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
handlers->AddHandler(std::make_unique<JavascriptPolicyHandler>());
|
|
|
handlers->AddHandler(std::make_unique<NetworkPredictionPolicyHandler>());
|
|
|
handlers->AddHandler(std::make_unique<RestoreOnStartupPolicyHandler>());
|
|
|
@@ -986,7 +986,7 @@
|
|
|
handlers->AddHandler(std::make_unique<SimpleDeprecatingPolicyHandler>(
|
|
|
std::make_unique<SimplePolicyHandler>(key::kAuthServerWhitelist,
|
|
|
prefs::kAuthServerAllowlist,
|
|
|
-@@ -1615,9 +1583,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
+@@ -1625,9 +1593,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
key::kWindowOcclusionEnabled,
|
|
|
policy::policy_prefs::kNativeWindowOcclusionEnabled,
|
|
|
base::Value::Type::BOOLEAN)));
|
|
|
@@ -996,7 +996,7 @@
|
|
|
handlers->AddHandler(std::make_unique<syncer::SyncPolicyHandler>());
|
|
|
handlers->AddHandler(std::make_unique<BrowsingHistoryPolicyHandler>());
|
|
|
|
|
|
-@@ -1706,12 +1671,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
+@@ -1716,12 +1681,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
key::kOnSecurityEventEnterpriseConnector,
|
|
|
enterprise_connectors::kOnSecurityEventPref,
|
|
|
enterprise_connectors::kOnSecurityEventScopePref, chrome_schema));
|
|
|
@@ -1009,7 +1009,7 @@
|
|
|
|
|
|
handlers->AddHandler(std::make_unique<BrowsingDataLifetimePolicyHandler>(
|
|
|
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
|
|
|
-@@ -1754,17 +1713,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
+@@ -1764,17 +1723,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
|
|
|
key::kForceBrowserSignin, prefs::kForceBrowserSignin,
|
|
|
base::Value::Type::BOOLEAN));
|
|
|
@@ -1037,7 +1037,7 @@
|
|
|
#include "components/search_engines/template_url_prepopulate_data.h"
|
|
|
#include "components/security_interstitials/content/insecure_form_blocking_page.h"
|
|
|
#include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
|
|
|
-@@ -878,7 +877,6 @@ void RegisterLocalState(PrefRegistrySimp
|
|
|
+@@ -905,7 +904,6 @@ void RegisterLocalState(PrefRegistrySimp
|
|
|
ProfileNetworkContextService::RegisterLocalStatePrefs(registry);
|
|
|
profiles::RegisterPrefs(registry);
|
|
|
RegisterScreenshotPrefs(registry);
|
|
|
@@ -1045,7 +1045,7 @@
|
|
|
secure_origin_allowlist::RegisterPrefs(registry);
|
|
|
#if !defined(OS_ANDROID)
|
|
|
SerialPolicyAllowedPorts::RegisterPrefs(registry);
|
|
|
-@@ -1123,7 +1121,6 @@ void RegisterProfilePrefs(user_prefs::Pr
|
|
|
+@@ -1152,7 +1150,6 @@ void RegisterProfilePrefs(user_prefs::Pr
|
|
|
PushMessagingAppIdentifier::RegisterProfilePrefs(registry);
|
|
|
QuietNotificationPermissionUiState::RegisterProfilePrefs(registry);
|
|
|
RegisterBrowserUserPrefs(registry);
|
|
|
@@ -1212,7 +1212,7 @@
|
|
|
ProfileAttributesEntry* entry = InitEntryWithKey(key, params.is_omitted);
|
|
|
--- a/chrome/browser/profiles/profile_impl.cc
|
|
|
+++ b/chrome/browser/profiles/profile_impl.cc
|
|
|
-@@ -141,7 +141,6 @@
|
|
|
+@@ -149,7 +149,6 @@
|
|
|
#include "components/prefs/scoped_user_pref_update.h"
|
|
|
#include "components/profile_metrics/browser_profile_type.h"
|
|
|
#include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
|
|
|
@@ -1230,7 +1230,7 @@
|
|
|
#include "components/signin/public/identity_manager/consent_level.h"
|
|
|
#include "components/signin/public/identity_manager/identity_manager.h"
|
|
|
#include "components/signin/public/identity_manager/primary_account_mutator.h"
|
|
|
-@@ -2083,8 +2082,7 @@ void ProfileManager::AddProfileToStorage
|
|
|
+@@ -2092,8 +2091,7 @@ void ProfileManager::AddProfileToStorage
|
|
|
entry->SetAuthInfo(account_info.gaia, username,
|
|
|
is_consented_primary_account);
|
|
|
|
|
|
@@ -1240,7 +1240,7 @@
|
|
|
|
|
|
#if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
|
|
|
// Sign out if force-sign-in policy is enabled and profile is not signed
|
|
|
-@@ -2139,14 +2137,13 @@ void ProfileManager::AddProfileToStorage
|
|
|
+@@ -2148,14 +2146,13 @@ void ProfileManager::AddProfileToStorage
|
|
|
|
|
|
init_params.is_ephemeral = IsEphemeral(profile);
|
|
|
init_params.is_signed_in_with_credential_provider =
|
|
|
@@ -1293,8 +1293,8 @@
|
|
|
</cr-dialog>
|
|
|
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
|
|
|
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
|
|
|
-@@ -748,7 +748,7 @@
|
|
|
- </template>
|
|
|
+@@ -536,7 +536,7 @@
|
|
|
+ </category-setting-exceptions>
|
|
|
</settings-subpage>
|
|
|
</template>
|
|
|
- <template is="dom-if" if="[[enableSafeBrowsingSubresourceFilter_]]"
|
|
|
@@ -1460,9 +1460,9 @@
|
|
|
/**
|
|
|
--- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
|
|
|
+++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
|
|
|
-@@ -56,7 +56,7 @@ function getCategoryItemMap() {
|
|
|
- disabledLabel: redesignEnabled ? 'siteSettingsAdsBlocked' :
|
|
|
- 'siteSettingsAdsBlock',
|
|
|
+@@ -51,7 +51,7 @@ function getCategoryItemMap() {
|
|
|
+ enabledLabel: 'siteSettingsAdsAllowed',
|
|
|
+ disabledLabel: 'siteSettingsAdsBlocked',
|
|
|
shouldShow: () =>
|
|
|
- loadTimeData.getBoolean('enableSafeBrowsingSubresourceFilter'),
|
|
|
+ false,
|
|
|
@@ -1627,7 +1627,7 @@
|
|
|
}
|
|
|
|
|
|
bool ChromePasswordProtectionService::IsExtendedReporting() {
|
|
|
-@@ -1493,40 +1484,7 @@ bool ChromePasswordProtectionService::Is
|
|
|
+@@ -1493,44 +1484,7 @@ bool ChromePasswordProtectionService::Is
|
|
|
bool ChromePasswordProtectionService::IsPingingEnabled(
|
|
|
LoginReputationClientRequest::TriggerType trigger_type,
|
|
|
ReusedPasswordAccountType password_type) {
|
|
|
@@ -1652,12 +1652,16 @@
|
|
|
- return extended_reporting_enabled;
|
|
|
- }
|
|
|
-
|
|
|
--// TODO(rsamp) Expand GAIA password pings from extended reporting to the general
|
|
|
--// Safe Browsing population.
|
|
|
--
|
|
|
--// Only saved password reuse warnings are shown on Android, so other types of
|
|
|
--// password reuse events should be gated by extended reporting.
|
|
|
+-// Only saved password and GAIA password reuse warnings are shown to users on
|
|
|
+-// Android, so other types of password reuse events should be gated by Safe
|
|
|
+-// Browsing extended reporting.
|
|
|
-#if defined(OS_ANDROID)
|
|
|
+- if (password_type.account_type() ==
|
|
|
+- ReusedPasswordAccountType::SAVED_PASSWORD ||
|
|
|
+- IsSyncingGMAILPasswordWithSignedInProtectionEnabled(password_type)) {
|
|
|
+- return true;
|
|
|
+- }
|
|
|
+-
|
|
|
- return extended_reporting_enabled;
|
|
|
-#else
|
|
|
- return true;
|
|
|
@@ -1669,7 +1673,7 @@
|
|
|
}
|
|
|
|
|
|
RequestOutcome ChromePasswordProtectionService::GetPingNotSentReason(
|
|
|
-@@ -1721,22 +1679,6 @@ MaybeCreateNavigationThrottle(content::N
|
|
|
+@@ -1725,22 +1679,6 @@ MaybeCreateNavigationThrottle(content::N
|
|
|
: nullptr;
|
|
|
}
|
|
|
|
|
|
@@ -1694,7 +1698,7 @@
|
|
|
if (!profile_)
|
|
|
--- a/chrome/browser/safe_browsing/chrome_password_protection_service.h
|
|
|
+++ b/chrome/browser/safe_browsing/chrome_password_protection_service.h
|
|
|
-@@ -212,13 +212,6 @@ class ChromePasswordProtectionService :
|
|
|
+@@ -213,13 +213,6 @@ class ChromePasswordProtectionService :
|
|
|
bool UserClickedThroughSBInterstitial(
|
|
|
PasswordProtectionRequest* request) override;
|
|
|
|
|
|
@@ -1762,7 +1766,7 @@
|
|
|
#include "content/public/browser/browser_task_traits.h"
|
|
|
--- a/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc
|
|
|
+++ b/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc
|
|
|
-@@ -90,7 +90,6 @@
|
|
|
+@@ -93,7 +93,6 @@
|
|
|
#include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
|
|
|
#include "components/safe_browsing/core/common/features.h"
|
|
|
#include "components/safe_browsing/core/common/proto/csd.pb.h"
|
|
|
@@ -1975,7 +1979,7 @@
|
|
|
#include "components/security_interstitials/content/security_interstitial_tab_helper.h"
|
|
|
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
|
|
|
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
|
|
|
-@@ -103,7 +103,6 @@ base::FilePath SafeBrowsingService::GetB
|
|
|
+@@ -100,7 +100,6 @@ base::FilePath SafeBrowsingService::GetB
|
|
|
|
|
|
SafeBrowsingService::SafeBrowsingService()
|
|
|
: services_delegate_(ServicesDelegate::Create(this)),
|
|
|
@@ -1983,7 +1987,7 @@
|
|
|
shutdown_(false),
|
|
|
enabled_(false),
|
|
|
enabled_by_prefs_(false) {}
|
|
|
-@@ -256,8 +255,6 @@ TriggerManager* SafeBrowsingService::tri
|
|
|
+@@ -253,8 +252,6 @@ TriggerManager* SafeBrowsingService::tri
|
|
|
|
|
|
PasswordProtectionService* SafeBrowsingService::GetPasswordProtectionService(
|
|
|
Profile* profile) const {
|
|
|
@@ -1992,7 +1996,7 @@
|
|
|
return nullptr;
|
|
|
}
|
|
|
|
|
|
-@@ -386,9 +383,6 @@ void SafeBrowsingService::OnProfileAdded
|
|
|
+@@ -383,9 +380,6 @@ void SafeBrowsingService::OnProfileAdded
|
|
|
std::unique_ptr<PrefChangeRegistrar> registrar =
|
|
|
std::make_unique<PrefChangeRegistrar>();
|
|
|
registrar->Init(pref_service);
|
|
|
@@ -2002,7 +2006,7 @@
|
|
|
// ClientSideDetectionService will need to be refresh the models
|
|
|
// renderers have if extended-reporting changes.
|
|
|
registrar->Add(prefs::kSafeBrowsingScoutReportingEnabled,
|
|
|
-@@ -400,14 +394,6 @@ void SafeBrowsingService::OnProfileAdded
|
|
|
+@@ -397,14 +391,6 @@ void SafeBrowsingService::OnProfileAdded
|
|
|
prefs_map_[pref_service] = std::move(registrar);
|
|
|
RefreshState();
|
|
|
|
|
|
@@ -2017,7 +2021,7 @@
|
|
|
// Extended Reporting metrics are handled together elsewhere.
|
|
|
RecordExtendedReportingMetrics(*pref_service);
|
|
|
|
|
|
-@@ -445,18 +431,6 @@ void SafeBrowsingService::RefreshState()
|
|
|
+@@ -442,18 +428,6 @@ void SafeBrowsingService::RefreshState()
|
|
|
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
|
// Check if any profile requires the service to be active.
|
|
|
enabled_by_prefs_ = false;
|
|
|
@@ -2221,7 +2225,7 @@
|
|
|
#include "components/user_manager/user_manager.h"
|
|
|
--- a/chrome/browser/signin/dice_browsertest.cc
|
|
|
+++ b/chrome/browser/signin/dice_browsertest.cc
|
|
|
-@@ -61,7 +61,6 @@
|
|
|
+@@ -59,7 +59,6 @@
|
|
|
#include "components/signin/public/base/account_consistency_method.h"
|
|
|
#include "components/signin/public/base/signin_client.h"
|
|
|
#include "components/signin/public/base/signin_metrics.h"
|
|
|
@@ -2258,6 +2262,45 @@
|
|
|
#include "content/public/common/content_client.h"
|
|
|
#include "content/public/test/browser_test.h"
|
|
|
#include "google_apis/gaia/gaia_urls.h"
|
|
|
+--- a/chrome/browser/signin/signin_manager.cc
|
|
|
++++ b/chrome/browser/signin/signin_manager.cc
|
|
|
+@@ -5,7 +5,6 @@
|
|
|
+ #include "chrome/browser/signin/signin_manager.h"
|
|
|
+
|
|
|
+ #include "components/prefs/pref_service.h"
|
|
|
+-#include "components/signin/public/base/signin_pref_names.h"
|
|
|
+ #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
|
|
|
+ #include "components/signin/public/identity_manager/identity_manager.h"
|
|
|
+ #include "components/signin/public/identity_manager/primary_account_mutator.h"
|
|
|
+@@ -13,11 +12,6 @@
|
|
|
+ SigninManager::SigninManager(PrefService* prefs,
|
|
|
+ signin::IdentityManager* identity_manager)
|
|
|
+ : prefs_(prefs), identity_manager_(identity_manager) {
|
|
|
+- signin_allowed_.Init(
|
|
|
+- prefs::kSigninAllowed, prefs_,
|
|
|
+- base::BindRepeating(&SigninManager::OnSigninAllowedPrefChanged,
|
|
|
+- base::Unretained(this)));
|
|
|
+-
|
|
|
+ UpdateUnconsentedPrimaryAccount();
|
|
|
+ identity_manager_->AddObserver(this);
|
|
|
+ }
|
|
|
+@@ -63,16 +57,6 @@ SigninManager::ComputeUnconsentedPrimary
|
|
|
+ signin::ConsentLevel::kSync);
|
|
|
+ }
|
|
|
+
|
|
|
+- // Clearing the primary sync account when sign-in is not allowed is handled
|
|
|
+- // by PrimaryAccountPolicyManager. That flow is extremely hard to follow
|
|
|
+- // especially for the case when the user is syncing with a managed account
|
|
|
+- // as in that case the whole profile needs to be deleted.
|
|
|
+- //
|
|
|
+- // It was considered simpler to keep the logic to update the unconsented
|
|
|
+- // primary account in a single place.
|
|
|
+- if (!signin_allowed_.GetValue())
|
|
|
+- return absl::nullopt;
|
|
|
+-
|
|
|
+ signin::AccountsInCookieJarInfo cookie_info =
|
|
|
+ identity_manager_->GetAccountsInCookieJar();
|
|
|
+
|
|
|
--- a/chrome/browser/signin/signin_promo_util.cc
|
|
|
+++ b/chrome/browser/signin/signin_promo_util.cc
|
|
|
@@ -8,7 +8,6 @@
|
|
|
@@ -2438,9 +2481,9 @@
|
|
|
// Copy supervised user settings to prefs.
|
|
|
--- a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
|
|
|
+++ b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
|
|
|
-@@ -39,7 +39,6 @@
|
|
|
- #include "components/autofill/core/common/autofill_prefs.h"
|
|
|
- #include "components/prefs/pref_service.h"
|
|
|
+@@ -37,7 +37,6 @@
|
|
|
+ #include "components/autofill/core/common/autofill_features.h"
|
|
|
+ #include "components/autofill/core/common/autofill_payments_features.h"
|
|
|
#include "components/signin/public/base/signin_buildflags.h"
|
|
|
-#include "components/signin/public/base/signin_pref_names.h"
|
|
|
#include "components/signin/public/identity_manager/identity_manager.h"
|
|
|
@@ -2467,7 +2510,7 @@
|
|
|
|
|
|
InitCommandState();
|
|
|
|
|
|
-@@ -1521,7 +1516,7 @@ void BrowserCommandController::UpdateSho
|
|
|
+@@ -1526,7 +1521,7 @@ void BrowserCommandController::UpdateSho
|
|
|
return;
|
|
|
|
|
|
command_updater_.UpdateCommandEnabled(
|
|
|
@@ -2663,28 +2706,8 @@
|
|
|
#include "components/signin/public/identity_manager/identity_test_utils.h"
|
|
|
#include "content/public/browser/render_frame_host.h"
|
|
|
#include "content/public/browser/render_process_host.h"
|
|
|
---- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
|
|
|
-+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
|
|
|
-@@ -37,7 +37,6 @@
|
|
|
- #include "chrome/common/url_constants.h"
|
|
|
- #include "components/download/public/common/download_item.h"
|
|
|
- #include "components/prefs/pref_service.h"
|
|
|
--#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
|
|
|
- #include "content/public/browser/browser_thread.h"
|
|
|
- #include "content/public/browser/download_manager.h"
|
|
|
- #include "content/public/browser/render_process_host.h"
|
|
|
---- a/chrome/browser/ui/webui/management/management_ui_handler.cc
|
|
|
-+++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
|
|
|
-@@ -29,7 +29,6 @@
|
|
|
- #include "chrome/browser/profiles/profile.h"
|
|
|
- #include "chrome/browser/ui/managed_ui.h"
|
|
|
- #include "chrome/common/pref_names.h"
|
|
|
--#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
|
|
|
- #include "components/strings/grit/components_strings.h"
|
|
|
- #include "content/public/browser/storage_partition.h"
|
|
|
- #include "content/public/browser/web_contents.h"
|
|
|
---- a/chrome/browser/ui/webui/new_tab_page/promo_browser_command/promo_browser_command_handler.cc
|
|
|
-+++ b/chrome/browser/ui/webui/new_tab_page/promo_browser_command/promo_browser_command_handler.cc
|
|
|
+--- a/chrome/browser/ui/webui/browser_command/browser_command_handler.cc
|
|
|
++++ b/chrome/browser/ui/webui/browser_command/browser_command_handler.cc
|
|
|
@@ -16,7 +16,6 @@
|
|
|
#include "chrome/common/webui_url_constants.h"
|
|
|
#include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
|
|
|
@@ -2693,7 +2716,7 @@
|
|
|
#include "ui/base/page_transition_types.h"
|
|
|
#include "ui/base/window_open_disposition.h"
|
|
|
|
|
|
-@@ -61,13 +60,6 @@ void PromoBrowserCommandHandler::CanExec
|
|
|
+@@ -61,13 +60,6 @@ void BrowserCommandHandler::CanExecuteCo
|
|
|
can_execute =
|
|
|
!chrome::enterprise_util::HasBrowserPoliciesApplied(profile_);
|
|
|
break;
|
|
|
@@ -2707,6 +2730,26 @@
|
|
|
case Command::kOpenFeedbackForm:
|
|
|
can_execute = true;
|
|
|
break;
|
|
|
+--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
|
|
|
++++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
|
|
|
+@@ -37,7 +37,6 @@
|
|
|
+ #include "chrome/common/url_constants.h"
|
|
|
+ #include "components/download/public/common/download_item.h"
|
|
|
+ #include "components/prefs/pref_service.h"
|
|
|
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
|
|
|
+ #include "content/public/browser/browser_thread.h"
|
|
|
+ #include "content/public/browser/download_manager.h"
|
|
|
+ #include "content/public/browser/render_process_host.h"
|
|
|
+--- a/chrome/browser/ui/webui/management/management_ui_handler.cc
|
|
|
++++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
|
|
|
+@@ -29,7 +29,6 @@
|
|
|
+ #include "chrome/browser/profiles/profile.h"
|
|
|
+ #include "chrome/browser/ui/managed_ui.h"
|
|
|
+ #include "chrome/common/pref_names.h"
|
|
|
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
|
|
|
+ #include "components/strings/grit/components_strings.h"
|
|
|
+ #include "content/public/browser/storage_partition.h"
|
|
|
+ #include "content/public/browser/web_contents.h"
|
|
|
--- a/chrome/browser/ui/webui/profile_info_watcher.cc
|
|
|
+++ b/chrome/browser/ui/webui/profile_info_watcher.cc
|
|
|
@@ -12,7 +12,6 @@
|
|
|
@@ -2760,7 +2803,7 @@
|
|
|
#include "components/signin/public/identity_manager/accounts_mutator.h"
|
|
|
#include "components/signin/public/identity_manager/consent_level.h"
|
|
|
#include "components/signin/public/identity_manager/identity_manager.h"
|
|
|
-@@ -287,10 +286,6 @@ void PeopleHandler::RegisterMessages() {
|
|
|
+@@ -292,10 +291,6 @@ void PeopleHandler::RegisterMessages() {
|
|
|
void PeopleHandler::OnJavascriptAllowed() {
|
|
|
PrefService* prefs = profile_->GetPrefs();
|
|
|
profile_pref_registrar_.Init(prefs);
|
|
|
@@ -2791,7 +2834,7 @@
|
|
|
#include "components/signin/public/base/signin_buildflags.h"
|
|
|
#include "components/strings/grit/components_chromium_strings.h"
|
|
|
#include "components/strings/grit/components_strings.h"
|
|
|
-@@ -1386,46 +1385,6 @@ void AddPrivacyStrings(content::WebUIDat
|
|
|
+@@ -1390,46 +1389,6 @@ void AddPrivacyStrings(content::WebUIDat
|
|
|
{"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
|
|
|
{"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
|
|
|
{"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT},
|
|
|
@@ -2838,7 +2881,7 @@
|
|
|
{"safeBrowsingSectionLabel", IDS_SETTINGS_SAFEBROWSING_SECTION_LABEL},
|
|
|
{"syncAndGoogleServicesPrivacyDescription",
|
|
|
IDS_SETTINGS_SYNC_AND_GOOGLE_SERVICES_PRIVACY_DESC_UNIFIED_CONSENT},
|
|
|
-@@ -2584,11 +2543,6 @@ void AddSiteSettingsStrings(content::Web
|
|
|
+@@ -2582,11 +2541,6 @@ void AddSiteSettingsStrings(content::Web
|
|
|
html_source->AddLocalizedStrings(kSensorsLocalizedStrings);
|
|
|
|
|
|
html_source->AddBoolean(
|
|
|
@@ -2852,7 +2895,7 @@
|
|
|
|
|
|
--- a/chrome/browser/ui/webui/settings/settings_ui.cc
|
|
|
+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
|
|
|
-@@ -74,7 +74,6 @@
|
|
|
+@@ -71,7 +71,6 @@
|
|
|
#include "components/pref_registry/pref_registry_syncable.h"
|
|
|
#include "components/prefs/pref_service.h"
|
|
|
#include "components/safe_browsing/core/common/features.h"
|
|
|
@@ -2860,7 +2903,7 @@
|
|
|
#include "content/public/browser/url_data_source.h"
|
|
|
#include "content/public/browser/web_contents.h"
|
|
|
#include "content/public/browser/web_ui.h"
|
|
|
-@@ -285,9 +284,7 @@ SettingsUI::SettingsUI(content::WebUI* w
|
|
|
+@@ -276,9 +275,7 @@ SettingsUI::SettingsUI(content::WebUI* w
|
|
|
? "enable-branding-update"
|
|
|
: "");
|
|
|
|
|
|
@@ -2873,15 +2916,15 @@
|
|
|
base::FeatureList::IsEnabled(
|
|
|
--- a/chrome/browser/ui/webui/signin/dice_turn_sync_on_helper.cc
|
|
|
+++ b/chrome/browser/ui/webui/signin/dice_turn_sync_on_helper.cc
|
|
|
-@@ -48,7 +48,6 @@
|
|
|
- #include "components/policy/core/common/management/platform_management_service.h"
|
|
|
+@@ -47,7 +47,6 @@
|
|
|
+ #include "components/policy/core/common/management/management_service.h"
|
|
|
#include "components/prefs/pref_service.h"
|
|
|
#include "components/signin/public/base/signin_metrics.h"
|
|
|
-#include "components/signin/public/base/signin_pref_names.h"
|
|
|
#include "components/signin/public/identity_manager/accounts_mutator.h"
|
|
|
#include "components/signin/public/identity_manager/identity_manager.h"
|
|
|
#include "components/signin/public/identity_manager/primary_account_mutator.h"
|
|
|
-@@ -243,8 +242,7 @@ DiceTurnSyncOnHelper::DiceTurnSyncOnHelp
|
|
|
+@@ -242,8 +241,7 @@ DiceTurnSyncOnHelper::DiceTurnSyncOnHelp
|
|
|
// last authenticated account of the current profile, then Chrome will show a
|
|
|
// confirmation dialog before starting sync.
|
|
|
// TODO(skym): Warn for high risk upgrade scenario (https://crbug.com/572754).
|
|
|
@@ -2893,7 +2936,7 @@
|
|
|
base::BindOnce(&DiceTurnSyncOnHelper::OnMergeAccountConfirmation,
|
|
|
--- a/chrome/browser/ui/webui/signin/dice_turn_sync_on_helper_unittest.cc
|
|
|
+++ b/chrome/browser/ui/webui/signin/dice_turn_sync_on_helper_unittest.cc
|
|
|
-@@ -37,7 +37,6 @@
|
|
|
+@@ -38,7 +38,6 @@
|
|
|
#include "components/prefs/pref_service.h"
|
|
|
#include "components/signin/public/base/account_consistency_method.h"
|
|
|
#include "components/signin/public/base/signin_metrics.h"
|
|
|
@@ -3046,7 +3089,7 @@
|
|
|
#include "services/network/public/cpp/shared_url_loader_factory.h"
|
|
|
|
|
|
namespace password_manager {
|
|
|
-@@ -162,28 +161,7 @@ void LeakDetectionDelegate::OnError(Leak
|
|
|
+@@ -163,28 +162,7 @@ void LeakDetectionDelegate::OnError(Leak
|
|
|
|
|
|
bool CanStartLeakCheck(const PrefService& prefs,
|
|
|
const PasswordManagerClient* client) {
|
|
|
@@ -3059,14 +3102,14 @@
|
|
|
- safe_browsing::SafeBrowsingState sb_state =
|
|
|
- safe_browsing::GetSafeBrowsingState(prefs);
|
|
|
- switch (sb_state) {
|
|
|
-- case safe_browsing::NO_SAFE_BROWSING:
|
|
|
+- case safe_browsing::SafeBrowsingState::NO_SAFE_BROWSING:
|
|
|
- LogString(client, Logger::STRING_LEAK_DETECTION_DISABLED_SAFE_BROWSING);
|
|
|
- return false;
|
|
|
-- case safe_browsing::STANDARD_PROTECTION:
|
|
|
+- case safe_browsing::SafeBrowsingState::STANDARD_PROTECTION:
|
|
|
- if (!is_leak_protection_on)
|
|
|
- LogString(client, Logger::STRING_LEAK_DETECTION_DISABLED_FEATURE);
|
|
|
- return is_leak_protection_on;
|
|
|
-- case safe_browsing::ENHANCED_PROTECTION:
|
|
|
+- case safe_browsing::SafeBrowsingState::ENHANCED_PROTECTION:
|
|
|
- // feature is on.
|
|
|
- break;
|
|
|
- }
|
|
|
@@ -3140,7 +3183,7 @@
|
|
|
void PasswordReuseManagerImpl::OnGetPasswordStoreResults(
|
|
|
--- a/components/password_manager/core/browser/password_store.cc
|
|
|
+++ b/components/password_manager/core/browser/password_store.cc
|
|
|
-@@ -42,7 +42,6 @@
|
|
|
+@@ -44,7 +44,6 @@
|
|
|
#include "components/password_manager/core/common/password_manager_features.h"
|
|
|
#include "components/password_manager/core/common/password_manager_pref_names.h"
|
|
|
#include "components/prefs/pref_service.h"
|
|
|
@@ -3380,16 +3423,16 @@
|
|
|
- }
|
|
|
-
|
|
|
- if (!pref_service_->GetBoolean(prefs::kSafeBrowsingEnhanced)) {
|
|
|
-- AddSafeBrowsingEventAndUserStateToPref(UserState::ENHANCED_PROTECTION,
|
|
|
+- AddSafeBrowsingEventAndUserStateToPref(UserState::kEnhancedProtection,
|
|
|
- EventType::USER_STATE_DISABLED);
|
|
|
- int disabled_times_last_week = GetEventCountSince(
|
|
|
-- UserState::ENHANCED_PROTECTION, EventType::USER_STATE_DISABLED,
|
|
|
+- UserState::kEnhancedProtection, EventType::USER_STATE_DISABLED,
|
|
|
- base::Time::Now() - base::TimeDelta::FromDays(7));
|
|
|
- if (disabled_times_last_week <= kEsbDisabledMetricsQuota) {
|
|
|
- LogEnhancedProtectionDisabledMetrics();
|
|
|
- }
|
|
|
- } else {
|
|
|
-- AddSafeBrowsingEventAndUserStateToPref(UserState::ENHANCED_PROTECTION,
|
|
|
+- AddSafeBrowsingEventAndUserStateToPref(UserState::kEnhancedProtection,
|
|
|
- EventType::USER_STATE_ENABLED);
|
|
|
- }
|
|
|
}
|
|
|
@@ -3409,18 +3452,18 @@
|
|
|
|
|
|
UserState SafeBrowsingMetricsCollector::GetUserState() {
|
|
|
- if (IsSafeBrowsingPolicyManaged(*pref_service_)) {
|
|
|
-- return UserState::MANAGED;
|
|
|
+- return UserState::kManaged;
|
|
|
- }
|
|
|
-
|
|
|
- SafeBrowsingState sb_state = GetSafeBrowsingState(*pref_service_);
|
|
|
- switch (sb_state) {
|
|
|
- case SafeBrowsingState::ENHANCED_PROTECTION:
|
|
|
-- return UserState::ENHANCED_PROTECTION;
|
|
|
+- return UserState::kEnhancedProtection;
|
|
|
- case SafeBrowsingState::STANDARD_PROTECTION:
|
|
|
-- return UserState::STANDARD_PROTECTION;
|
|
|
+- return UserState::kStandardProtection;
|
|
|
- case SafeBrowsingState::NO_SAFE_BROWSING:
|
|
|
- NOTREACHED() << "Unexpected Safe Browsing state.";
|
|
|
-- return UserState::STANDARD_PROTECTION;
|
|
|
+- return UserState::kStandardProtection;
|
|
|
- }
|
|
|
+ NOTREACHED() << "Unexpected Safe Browsing state.";
|
|
|
}
|
|
|
@@ -3436,11 +3479,11 @@
|
|
|
#include "components/safe_browsing/core/common/utils.h"
|
|
|
#include "components/sessions/content/session_tab_helper.h"
|
|
|
#include "content/public/browser/navigation_details.h"
|
|
|
-@@ -299,7 +298,7 @@ GURL SafeBrowsingNavigationObserverManag
|
|
|
+@@ -304,7 +303,7 @@ GURL SafeBrowsingNavigationObserverManag
|
|
|
bool SafeBrowsingNavigationObserverManager::IsEnabledAndReady(
|
|
|
PrefService* prefs,
|
|
|
- SafeBrowsingServiceInterface* safe_browsing_service) {
|
|
|
-- return IsSafeBrowsingEnabled(*prefs) && safe_browsing_service;
|
|
|
+ bool has_safe_browsing_service) {
|
|
|
+- return IsSafeBrowsingEnabled(*prefs) && has_safe_browsing_service;
|
|
|
+ return false;
|
|
|
}
|
|
|
|
|
|
@@ -3569,7 +3612,7 @@
|
|
|
#include "services/network/public/mojom/cookie_manager.mojom.h"
|
|
|
#if BUILDFLAG(FULL_SAFE_BROWSING)
|
|
|
#include "components/enterprise/common/proto/connectors.pb.h"
|
|
|
-@@ -1962,18 +1961,13 @@ void SafeBrowsingUIHandler::GetPrefs(con
|
|
|
+@@ -1991,18 +1990,13 @@ void SafeBrowsingUIHandler::GetPrefs(con
|
|
|
AllowJavascript();
|
|
|
std::string callback_id;
|
|
|
args->GetString(0, &callback_id);
|
|
|
@@ -3659,7 +3702,7 @@
|
|
|
void V4LocalDatabaseManager::UpdateRequestCompleted(
|
|
|
--- a/components/safe_browsing/core/browser/db/v4_local_database_manager.h
|
|
|
+++ b/components/safe_browsing/core/browser/db/v4_local_database_manager.h
|
|
|
-@@ -36,8 +36,7 @@ class V4LocalDatabaseManager : public Sa
|
|
|
+@@ -37,8 +37,7 @@ class V4LocalDatabaseManager : public Sa
|
|
|
static scoped_refptr<V4LocalDatabaseManager> Create(
|
|
|
const base::FilePath& base_path,
|
|
|
scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
|
|
|
@@ -3669,7 +3712,7 @@
|
|
|
|
|
|
// Populates the protobuf with the database data.
|
|
|
void CollectDatabaseManagerInfo(
|
|
|
-@@ -104,7 +103,6 @@ class V4LocalDatabaseManager : public Sa
|
|
|
+@@ -105,7 +104,6 @@ class V4LocalDatabaseManager : public Sa
|
|
|
// Must be initialized by calling StartOnIOThread() before using.
|
|
|
V4LocalDatabaseManager(
|
|
|
const base::FilePath& base_path,
|
|
|
@@ -3677,7 +3720,7 @@
|
|
|
scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
|
|
|
scoped_refptr<base::SequencedTaskRunner> io_task_runner,
|
|
|
scoped_refptr<base::SequencedTaskRunner> task_runner_for_tests);
|
|
|
-@@ -363,10 +361,6 @@ class V4LocalDatabaseManager : public Sa
|
|
|
+@@ -364,10 +362,6 @@ class V4LocalDatabaseManager : public Sa
|
|
|
// ready to process next update.
|
|
|
DatabaseUpdatedCallback db_updated_callback_;
|
|
|
|
|
|
@@ -3949,18 +3992,18 @@
|
|
|
#include "components/unified_consent/pref_names.h"
|
|
|
#include "net/base/ip_address.h"
|
|
|
#include "net/base/load_flags.h"
|
|
|
-@@ -60,10 +59,6 @@ RealTimeUrlLookupService::RealTimeUrlLoo
|
|
|
- is_off_the_record_(is_off_the_record),
|
|
|
+@@ -61,10 +60,6 @@ RealTimeUrlLookupService::RealTimeUrlLoo
|
|
|
variations_(variations_service) {
|
|
|
pref_change_registrar_.Init(pref_service_);
|
|
|
-- pref_change_registrar_.Add(
|
|
|
+ pref_change_registrar_.Add(
|
|
|
- prefs::kSafeBrowsingEnhanced,
|
|
|
- base::BindRepeating(&RealTimeUrlLookupService::OnPrefChanged,
|
|
|
- base::Unretained(this)));
|
|
|
- pref_change_registrar_.Add(
|
|
|
+- pref_change_registrar_.Add(
|
|
|
unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled,
|
|
|
base::BindRepeating(&RealTimeUrlLookupService::OnPrefChanged,
|
|
|
-@@ -131,7 +126,7 @@ int RealTimeUrlLookupService::GetReferre
|
|
|
+ base::Unretained(this)));
|
|
|
+@@ -134,7 +129,7 @@ int RealTimeUrlLookupService::GetReferre
|
|
|
}
|
|
|
|
|
|
bool RealTimeUrlLookupService::CanCheckSubresourceURL() const {
|
|
|
@@ -4426,7 +4469,7 @@
|
|
|
#include "components/sync_preferences/testing_pref_service_syncable.h"
|
|
|
--- a/components/signin/core/browser/account_reconcilor_unittest.cc
|
|
|
+++ b/components/signin/core/browser/account_reconcilor_unittest.cc
|
|
|
-@@ -28,7 +28,6 @@
|
|
|
+@@ -29,7 +29,6 @@
|
|
|
#include "components/signin/public/base/list_accounts_test_utils.h"
|
|
|
#include "components/signin/public/base/signin_buildflags.h"
|
|
|
#include "components/signin/public/base/signin_metrics.h"
|
|
|
@@ -4547,7 +4590,7 @@
|
|
|
-
|
|
|
- base::DictionaryValue* dict = nullptr;
|
|
|
- ListPrefUpdate update(pref_service_, prefs::kAccountInfo);
|
|
|
-- for (size_t i = 0; i < update->GetSize(); ++i, dict = nullptr) {
|
|
|
+- for (size_t i = 0; i < update->GetList().size(); ++i, dict = nullptr) {
|
|
|
- if (update->GetDictionary(i, &dict)) {
|
|
|
- std::string value;
|
|
|
- if (dict->GetString(kAccountKeyPath, &value) &&
|
|
|
@@ -4570,7 +4613,7 @@
|
|
|
void AccountTrackerService::LoadFromPrefs() {
|
|
|
- const base::ListValue* list = pref_service_->GetList(prefs::kAccountInfo);
|
|
|
std::set<CoreAccountId> to_remove;
|
|
|
-- for (size_t i = 0; i < list->GetSize(); ++i) {
|
|
|
+- for (size_t i = 0; i < list->GetList().size(); ++i) {
|
|
|
+ for (size_t i = 0; false; ++i) {
|
|
|
const base::DictionaryValue* dict = nullptr;
|
|
|
- if (list->GetDictionary(i, &dict)) {
|
|
|
@@ -4603,7 +4646,7 @@
|
|
|
|
|
|
base::DictionaryValue* dict = nullptr;
|
|
|
- ListPrefUpdate update(pref_service_, prefs::kAccountInfo);
|
|
|
-- for (size_t i = 0; i < update->GetSize(); ++i, dict = nullptr) {
|
|
|
+- for (size_t i = 0; i < update->GetList().size(); ++i, dict = nullptr) {
|
|
|
- if (update->GetDictionary(i, &dict)) {
|
|
|
+ if (false) {
|
|
|
+ while (false) {
|
|
|
@@ -4616,7 +4659,7 @@
|
|
|
dict = new base::DictionaryValue();
|
|
|
- update->Append(base::WrapUnique(dict));
|
|
|
- // |dict| is invalidated at this point, so it needs to be reset.
|
|
|
-- update->GetDictionary(update->GetSize() - 1, &dict);
|
|
|
+- update->GetDictionary(update->GetList().size() - 1, &dict);
|
|
|
dict->SetString(kAccountKeyPath, account_info.account_id.ToString());
|
|
|
}
|
|
|
|
|
|
@@ -4666,7 +4709,7 @@
|
|
|
#include "components/signin/public/identity_manager/set_accounts_in_cookie_result.h"
|
|
|
#include "google_apis/gaia/gaia_constants.h"
|
|
|
#include "google_apis/gaia/gaia_urls.h"
|
|
|
-@@ -459,9 +458,7 @@ GaiaCookieManagerService::GaiaCookieMana
|
|
|
+@@ -457,9 +456,7 @@ GaiaCookieManagerService::GaiaCookieMana
|
|
|
listAccountsUnexpectedServerResponseRetried_(false),
|
|
|
external_cc_result_fetched_(false),
|
|
|
list_accounts_stale_(true) {
|
|
|
@@ -4677,7 +4720,7 @@
|
|
|
|
|
|
if (!gaia_cookie_last_list_accounts_data.empty()) {
|
|
|
if (!gaia::ParseListAccountsData(gaia_cookie_last_list_accounts_data,
|
|
|
-@@ -485,8 +482,6 @@ GaiaCookieManagerService::~GaiaCookieMan
|
|
|
+@@ -483,8 +480,6 @@ GaiaCookieManagerService::~GaiaCookieMan
|
|
|
|
|
|
// static
|
|
|
void GaiaCookieManagerService::RegisterPrefs(PrefRegistrySimple* registry) {
|
|
|
@@ -4686,7 +4729,7 @@
|
|
|
}
|
|
|
|
|
|
void GaiaCookieManagerService::InitCookieListener() {
|
|
|
-@@ -909,16 +904,12 @@ void GaiaCookieManagerService::OnListAcc
|
|
|
+@@ -907,16 +902,12 @@ void GaiaCookieManagerService::OnListAcc
|
|
|
&signed_out_accounts_)) {
|
|
|
listed_accounts_.clear();
|
|
|
signed_out_accounts_.clear();
|
|
|
@@ -4789,7 +4832,7 @@
|
|
|
#include "components/signin/public/base/signin_switches.h"
|
|
|
|
|
|
using signin::PrimaryAccountChangeEvent;
|
|
|
-@@ -47,23 +46,10 @@ PrimaryAccountManager::~PrimaryAccountMa
|
|
|
+@@ -47,22 +46,10 @@ PrimaryAccountManager::~PrimaryAccountMa
|
|
|
|
|
|
// static
|
|
|
void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
|
|
|
@@ -4802,7 +4845,6 @@
|
|
|
- registry->RegisterBooleanPref(prefs::kAutologinEnabled, true);
|
|
|
- registry->RegisterListPref(prefs::kReverseAutologinRejectedEmailList);
|
|
|
- registry->RegisterBooleanPref(prefs::kSigninAllowed, true);
|
|
|
-- registry->RegisterBooleanPref(prefs::kSigninAllowedByPolicy, true);
|
|
|
- registry->RegisterBooleanPref(prefs::kSignedInWithCredentialProvider, false);
|
|
|
}
|
|
|
|
|
|
@@ -4813,7 +4855,7 @@
|
|
|
}
|
|
|
|
|
|
void PrimaryAccountManager::Initialize(PrefService* local_state) {
|
|
|
-@@ -71,25 +57,7 @@ void PrimaryAccountManager::Initialize(P
|
|
|
+@@ -70,25 +57,7 @@ void PrimaryAccountManager::Initialize(P
|
|
|
DCHECK(!IsInitialized());
|
|
|
initialized_ = true;
|
|
|
|
|
|
@@ -4840,7 +4882,7 @@
|
|
|
|
|
|
if (!pref_account_id.empty()) {
|
|
|
if (account_tracker_service_->GetMigrationState() ==
|
|
|
-@@ -99,14 +67,11 @@ void PrimaryAccountManager::Initialize(P
|
|
|
+@@ -98,14 +67,11 @@ void PrimaryAccountManager::Initialize(P
|
|
|
// |account_info.gaia| could be empty if |account_id| is already gaia id.
|
|
|
if (!account_info.gaia.empty()) {
|
|
|
pref_account_id = account_info.gaia;
|
|
|
@@ -4856,7 +4898,7 @@
|
|
|
CoreAccountId account_id = CoreAccountId::FromString(pref_account_id);
|
|
|
CoreAccountInfo account_info =
|
|
|
account_tracker_service_->GetAccountInfo(account_id);
|
|
|
-@@ -167,8 +132,7 @@ void PrimaryAccountManager::SetSyncPrima
|
|
|
+@@ -166,8 +132,7 @@ void PrimaryAccountManager::SetSyncPrima
|
|
|
|
|
|
#if DCHECK_IS_ON()
|
|
|
{
|
|
|
@@ -4866,7 +4908,7 @@
|
|
|
bool consented_to_sync =
|
|
|
client_->GetPrefs()->GetBoolean(prefs::kGoogleServicesConsentedToSync);
|
|
|
|
|
|
-@@ -184,10 +148,6 @@ void PrimaryAccountManager::SetSyncPrima
|
|
|
+@@ -183,10 +148,6 @@ void PrimaryAccountManager::SetSyncPrima
|
|
|
// Go ahead and update the last signed in account info here as well. Once a
|
|
|
// user is signed in the corresponding preferences should match. Doing it here
|
|
|
// as opposed to on signin allows us to catch the upgrade scenario.
|
|
|
@@ -4877,7 +4919,7 @@
|
|
|
|
|
|
// Commit primary sync account info immediately so that it does not get lost
|
|
|
// if Chrome crashes before the next commit interval.
|
|
|
-@@ -201,20 +161,11 @@ void PrimaryAccountManager::SetPrimaryAc
|
|
|
+@@ -200,20 +161,11 @@ void PrimaryAccountManager::SetPrimaryAc
|
|
|
|
|
|
PrefService* prefs = client_->GetPrefs();
|
|
|
const std::string& account_id = primary_account_info_.account_id.ToString();
|
|
|
@@ -5158,7 +5200,7 @@
|
|
|
#include "components/signin/public/identity_manager/identity_test_utils.h"
|
|
|
--- a/tools/metrics/histograms/enums.xml
|
|
|
+++ b/tools/metrics/histograms/enums.xml
|
|
|
-@@ -82038,7 +82038,6 @@ Full version information for the fingerp
|
|
|
+@@ -82686,7 +82686,6 @@ Full version information for the fingerp
|
|
|
<int value="3" label="kRestoreOnStartup"/>
|
|
|
<int value="4" label="kURLsToRestoreOnStartup"/>
|
|
|
<int value="5" label="extensions::pref_names::kExtensions"/>
|
|
|
@@ -5166,7 +5208,7 @@
|
|
|
<int value="7" label="kSearchProviderOverrides"/>
|
|
|
<int value="8" label="kDefaultSearchProviderSearchURL (Obsolete 12/2016)"/>
|
|
|
<int value="9" label="kDefaultSearchProviderKeyword (Obsolete 12/2016)"/>
|
|
|
-@@ -82053,10 +82052,7 @@ Full version information for the fingerp
|
|
|
+@@ -82701,10 +82700,7 @@ Full version information for the fingerp
|
|
|
<int value="18" label="kSafeBrowsingIncidentsSent"/>
|
|
|
<int value="19" label="kSwReporterPromptVersion"/>
|
|
|
<int value="20" label="kSwReporterPromptReason"/>
|
Blaise