|
|
@@ -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
|
|
|
-@@ -1591,78 +1591,9 @@
|
|
|
+@@ -1636,69 +1636,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>
|
|
|
@@ -33,9 +33,6 @@
|
|
|
- <message name="IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION_DESC" desc="Checkbox label: should Chrome protect user and user's device from dangerous sites">
|
|
|
- Sends URLs of some pages you visit to Google, when your security is at risk
|
|
|
- </message>
|
|
|
-- <message name="IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING" desc="The section title of the extended safe browsing checkbox to help improve safe browsing">
|
|
|
-- Help improve Chrome security
|
|
|
-- </message>
|
|
|
- <message name="IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC" desc="Description for extended safe browsing">
|
|
|
- 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.
|
|
|
- </message>
|
|
|
@@ -54,9 +51,6 @@
|
|
|
- <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_ONE" desc="First bullet point under the safe browsing enhanced protection mode">
|
|
|
- Predicts and warns you about dangerous events before they happen
|
|
|
- </message>
|
|
|
-- <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_TWO" desc="Second bullet point under the safe browsing enhanced protection mode">
|
|
|
-- Keeps you safe on Chrome and may be used to improve your security in other Google apps when you are signed in
|
|
|
-- </message>
|
|
|
- <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_THREE" desc="Third bullet point under the safe browsing enhanced protection mode">
|
|
|
- Improves security for you and everyone on the web
|
|
|
- </message>
|
|
|
@@ -78,9 +72,6 @@
|
|
|
- <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_ONE" desc="First bullet point under the safe browsing standard protection mode">
|
|
|
- Detects and warns you about dangerous events when they happen
|
|
|
- </message>
|
|
|
-- <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_TWO" desc="First bullet point under the safe browsing standard protection mode">
|
|
|
-- 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.
|
|
|
-- </message>
|
|
|
- <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_HELP_IMPROVE" desc="The name of the toggle to enable reporting to help improve safe browsing">
|
|
|
- Help improve security on the web for everyone
|
|
|
- </message>
|
|
|
@@ -233,7 +224,7 @@
|
|
|
user_manager::known_user::SetStringPref(
|
|
|
--- a/chrome/browser/chrome_content_browser_client.cc
|
|
|
+++ b/chrome/browser/chrome_content_browser_client.cc
|
|
|
-@@ -225,7 +225,6 @@
|
|
|
+@@ -226,7 +226,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"
|
|
|
@@ -304,7 +295,7 @@
|
|
|
#include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
|
|
|
#include "components/policy/core/common/policy_types.h"
|
|
|
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
|
|
|
- #include "components/signin/public/identity_manager/consent_level.h"
|
|
|
+ #include "components/signin/public/base/consent_level.h"
|
|
|
#include "components/signin/public/identity_manager/identity_manager.h"
|
|
|
#include "components/user_prefs/user_prefs.h"
|
|
|
@@ -406,8 +405,7 @@ std::string ConnectorsService::GetManage
|
|
|
@@ -610,7 +601,7 @@
|
|
|
#include "components/search_engines/default_search_manager.h"
|
|
|
#include "components/spellcheck/browser/pref_names.h"
|
|
|
#include "components/translate/core/browser/translate_pref_names.h"
|
|
|
-@@ -283,16 +282,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
|
|
|
+@@ -287,16 +286,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
|
|
|
settings_api::PrefType::PREF_TYPE_BOOLEAN;
|
|
|
|
|
|
// Security page
|
|
|
@@ -717,7 +708,7 @@
|
|
|
#include "content/public/browser/browser_context.h"
|
|
|
#include "content/public/browser/browser_thread.h"
|
|
|
#include "content/public/browser/network_service_instance.h"
|
|
|
-@@ -741,13 +740,6 @@ void ProfileNetworkContextService::Confi
|
|
|
+@@ -759,13 +758,6 @@ void ProfileNetworkContextService::Confi
|
|
|
network_context_params->enable_certificate_reporting = true;
|
|
|
network_context_params->enable_expect_ct_reporting = true;
|
|
|
|
|
|
@@ -905,7 +896,7 @@
|
|
|
}
|
|
|
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
|
|
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
|
|
-@@ -83,12 +83,9 @@
|
|
|
+@@ -85,12 +85,9 @@
|
|
|
#include "components/policy/core/common/schema.h"
|
|
|
#include "components/policy/policy_constants.h"
|
|
|
#include "components/proxy_config/proxy_policy_handler.h"
|
|
|
@@ -918,7 +909,7 @@
|
|
|
#include "components/spellcheck/spellcheck_buildflags.h"
|
|
|
#include "components/sync/base/pref_names.h"
|
|
|
#include "components/sync/driver/sync_policy_handler.h"
|
|
|
-@@ -209,15 +206,6 @@ const PolicyToPreferenceMapEntry kSimple
|
|
|
+@@ -211,15 +208,6 @@ const PolicyToPreferenceMapEntry kSimple
|
|
|
{ key::kQuicAllowed,
|
|
|
prefs::kQuicAllowed,
|
|
|
base::Value::Type::BOOLEAN },
|
|
|
@@ -934,7 +925,7 @@
|
|
|
{ key::kUrlKeyedAnonymizedDataCollectionEnabled,
|
|
|
unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled,
|
|
|
base::Value::Type::BOOLEAN },
|
|
|
-@@ -353,15 +341,6 @@ const PolicyToPreferenceMapEntry kSimple
|
|
|
+@@ -355,15 +343,6 @@ const PolicyToPreferenceMapEntry kSimple
|
|
|
{ key::kGloballyScopeHTTPAuthCacheEnabled,
|
|
|
prefs::kGloballyScopeHTTPAuthCacheEnabled,
|
|
|
base::Value::Type::BOOLEAN },
|
|
|
@@ -950,7 +941,7 @@
|
|
|
{ key::kSafeSitesFilterBehavior,
|
|
|
policy_prefs::kSafeSitesFilterBehavior,
|
|
|
base::Value::Type::INTEGER },
|
|
|
-@@ -470,18 +449,12 @@ const PolicyToPreferenceMapEntry kSimple
|
|
|
+@@ -472,18 +451,12 @@ const PolicyToPreferenceMapEntry kSimple
|
|
|
{ key::kMaxConnectionsPerProxy,
|
|
|
prefs::kMaxConnectionsPerProxy,
|
|
|
base::Value::Type::INTEGER },
|
|
|
@@ -969,7 +960,7 @@
|
|
|
{ key::kCECPQ2Enabled,
|
|
|
prefs::kCECPQ2Enabled,
|
|
|
base::Value::Type::BOOLEAN },
|
|
|
-@@ -684,9 +657,6 @@ const PolicyToPreferenceMapEntry kSimple
|
|
|
+@@ -683,9 +656,6 @@ const PolicyToPreferenceMapEntry kSimple
|
|
|
{ key::kIntranetRedirectBehavior,
|
|
|
omnibox::kIntranetRedirectBehavior,
|
|
|
base::Value::Type::INTEGER },
|
|
|
@@ -979,7 +970,7 @@
|
|
|
{ key::kAccessibilityImageLabelsEnabled,
|
|
|
prefs::kAccessibilityImageLabelsEnabled,
|
|
|
base::Value::Type::BOOLEAN },
|
|
|
-@@ -1642,8 +1612,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
+@@ -1665,8 +1635,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
handlers->AddHandler(std::make_unique<JavascriptPolicyHandler>());
|
|
|
handlers->AddHandler(std::make_unique<NetworkPredictionPolicyHandler>());
|
|
|
handlers->AddHandler(std::make_unique<RestoreOnStartupPolicyHandler>());
|
|
|
@@ -988,7 +979,7 @@
|
|
|
handlers->AddHandler(std::make_unique<SimpleDeprecatingPolicyHandler>(
|
|
|
std::make_unique<SimplePolicyHandler>(key::kAuthServerWhitelist,
|
|
|
prefs::kAuthServerAllowlist,
|
|
|
-@@ -1667,9 +1635,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
+@@ -1690,9 +1658,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
key::kWindowOcclusionEnabled,
|
|
|
policy::policy_prefs::kNativeWindowOcclusionEnabled,
|
|
|
base::Value::Type::BOOLEAN)));
|
|
|
@@ -998,7 +989,7 @@
|
|
|
handlers->AddHandler(std::make_unique<syncer::SyncPolicyHandler>());
|
|
|
handlers->AddHandler(std::make_unique<BrowsingHistoryPolicyHandler>());
|
|
|
|
|
|
-@@ -1762,12 +1727,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
+@@ -1783,12 +1748,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
key::kOnSecurityEventEnterpriseConnector,
|
|
|
enterprise_connectors::kOnSecurityEventPref,
|
|
|
enterprise_connectors::kOnSecurityEventScopePref, chrome_schema));
|
|
|
@@ -1011,7 +1002,7 @@
|
|
|
|
|
|
handlers->AddHandler(std::make_unique<BrowsingDataLifetimePolicyHandler>(
|
|
|
key::kClearBrowsingDataOnExitList,
|
|
|
-@@ -1806,17 +1765,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
+@@ -1827,17 +1786,6 @@ std::unique_ptr<ConfigurationPolicyHandl
|
|
|
signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
|
|
|
key::kForceBrowserSignin, prefs::kForceBrowserSignin,
|
|
|
base::Value::Type::BOOLEAN));
|
|
|
@@ -1031,7 +1022,7 @@
|
|
|
std::make_unique<BrowserSigninPolicyHandler>(chrome_schema)));
|
|
|
--- a/chrome/browser/prefs/browser_prefs.cc
|
|
|
+++ b/chrome/browser/prefs/browser_prefs.cc
|
|
|
-@@ -139,7 +139,6 @@
|
|
|
+@@ -135,7 +135,6 @@
|
|
|
#include "components/prefs/pref_service.h"
|
|
|
#include "components/privacy_sandbox/privacy_sandbox_prefs.h"
|
|
|
#include "components/proxy_config/pref_proxy_config_tracker_impl.h"
|
|
|
@@ -1039,7 +1030,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"
|
|
|
-@@ -921,7 +920,6 @@ void RegisterLocalState(PrefRegistrySimp
|
|
|
+@@ -940,7 +939,6 @@ void RegisterLocalState(PrefRegistrySimp
|
|
|
ProfileNetworkContextService::RegisterLocalStatePrefs(registry);
|
|
|
profiles::RegisterPrefs(registry);
|
|
|
RegisterScreenshotPrefs(registry);
|
|
|
@@ -1047,7 +1038,7 @@
|
|
|
secure_origin_allowlist::RegisterPrefs(registry);
|
|
|
#if !defined(OS_ANDROID)
|
|
|
SerialPolicyAllowedPorts::RegisterPrefs(registry);
|
|
|
-@@ -1171,7 +1169,6 @@ void RegisterProfilePrefs(user_prefs::Pr
|
|
|
+@@ -1188,7 +1186,6 @@ void RegisterProfilePrefs(user_prefs::Pr
|
|
|
PushMessagingAppIdentifier::RegisterProfilePrefs(registry);
|
|
|
QuietNotificationPermissionUiState::RegisterProfilePrefs(registry);
|
|
|
RegisterBrowserUserPrefs(registry);
|
|
|
@@ -1146,14 +1137,14 @@
|
|
|
EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
|
|
|
--- a/chrome/browser/profiles/gaia_info_update_service.cc
|
|
|
+++ b/chrome/browser/profiles/gaia_info_update_service.cc
|
|
|
-@@ -19,7 +19,6 @@
|
|
|
- #include "chrome/common/pref_names.h"
|
|
|
+@@ -20,7 +20,6 @@
|
|
|
#include "components/prefs/pref_service.h"
|
|
|
#include "components/signin/public/base/avatar_icon_util.h"
|
|
|
+ #include "components/signin/public/base/consent_level.h"
|
|
|
-#include "components/signin/public/base/signin_pref_names.h"
|
|
|
#include "components/signin/public/identity_manager/account_info.h"
|
|
|
#include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
|
|
|
- #include "components/signin/public/identity_manager/consent_level.h"
|
|
|
+ #include "content/public/browser/notification_details.h"
|
|
|
--- a/chrome/browser/profiles/gaia_info_update_service_unittest.cc
|
|
|
+++ b/chrome/browser/profiles/gaia_info_update_service_unittest.cc
|
|
|
@@ -27,7 +27,6 @@
|
|
|
@@ -1183,7 +1174,7 @@
|
|
|
}
|
|
|
|
|
|
size_t ProfileAttributesEntry::GetAvatarIconIndex() const {
|
|
|
-@@ -672,9 +671,6 @@ void ProfileAttributesEntry::SetLastDown
|
|
|
+@@ -670,9 +669,6 @@ void ProfileAttributesEntry::SetLastDown
|
|
|
}
|
|
|
|
|
|
void ProfileAttributesEntry::SetSignedInWithCredentialProvider(bool value) {
|
|
|
@@ -1224,15 +1215,15 @@
|
|
|
#include "components/spellcheck/spellcheck_buildflags.h"
|
|
|
--- a/chrome/browser/profiles/profile_manager.cc
|
|
|
+++ b/chrome/browser/profiles/profile_manager.cc
|
|
|
-@@ -94,7 +94,6 @@
|
|
|
- #include "components/search_engines/default_search_manager.h"
|
|
|
+@@ -96,7 +96,6 @@
|
|
|
+ #include "components/signin/public/base/consent_level.h"
|
|
|
#include "components/signin/public/base/signin_buildflags.h"
|
|
|
#include "components/signin/public/base/signin_metrics.h"
|
|
|
-#include "components/signin/public/base/signin_pref_names.h"
|
|
|
- #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"
|
|
|
-@@ -2105,8 +2104,7 @@ void ProfileManager::AddProfileToStorage
|
|
|
+ #include "components/sync/base/stop_source.h"
|
|
|
+@@ -2104,8 +2103,7 @@ void ProfileManager::AddProfileToStorage
|
|
|
entry->SetAuthInfo(account_info.gaia, username,
|
|
|
is_consented_primary_account);
|
|
|
|
|
|
@@ -1242,7 +1233,7 @@
|
|
|
|
|
|
#if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
|
|
|
// Sign out if force-sign-in policy is enabled and profile is not signed
|
|
|
-@@ -2161,14 +2159,13 @@ void ProfileManager::AddProfileToStorage
|
|
|
+@@ -2160,14 +2158,13 @@ void ProfileManager::AddProfileToStorage
|
|
|
|
|
|
init_params.is_ephemeral = IsEphemeral(profile);
|
|
|
init_params.is_signed_in_with_credential_provider =
|
|
|
@@ -1306,7 +1297,7 @@
|
|
|
<settings-subpage page-title="$i18n{siteSettingsAds}"
|
|
|
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
|
|
|
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
|
|
|
-@@ -90,7 +90,7 @@ export class SettingsPrivacyPageElement
|
|
|
+@@ -85,7 +85,7 @@ export class SettingsPrivacyPageElement
|
|
|
enableSafeBrowsingSubresourceFilter_: {
|
|
|
type: Boolean,
|
|
|
value() {
|
|
|
@@ -1434,7 +1425,7 @@
|
|
|
- </template>
|
|
|
--- a/chrome/browser/resources/settings/privacy_page/security_page.ts
|
|
|
+++ b/chrome/browser/resources/settings/privacy_page/security_page.ts
|
|
|
-@@ -182,15 +182,6 @@ export class SettingsSecurityPageElement
|
|
|
+@@ -176,15 +176,6 @@ export class SettingsSecurityPageElement
|
|
|
|
|
|
ready() {
|
|
|
super.ready();
|
|
|
@@ -1450,7 +1441,7 @@
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
-@@ -239,8 +230,7 @@ export class SettingsSecurityPageElement
|
|
|
+@@ -233,8 +224,7 @@ export class SettingsSecurityPageElement
|
|
|
}
|
|
|
|
|
|
private getDisabledExtendedSafeBrowsing_(): boolean {
|
|
|
@@ -1488,9 +1479,9 @@
|
|
|
#include "components/prefs/pref_service.h"
|
|
|
#include "components/safe_browsing/core/common/features.h"
|
|
|
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
|
|
|
+ #include "components/signin/public/base/consent_level.h"
|
|
|
#include "components/signin/public/identity_manager/account_info.h"
|
|
|
#include "components/signin/public/identity_manager/accounts_mutator.h"
|
|
|
- #include "components/signin/public/identity_manager/consent_level.h"
|
|
|
@@ -63,9 +62,7 @@ void AdvancedProtectionStatusManager::Ma
|
|
|
|
|
|
is_under_advanced_protection_ = core_info.is_under_advanced_protection;
|
|
|
@@ -1604,7 +1595,7 @@
|
|
|
#include "components/safe_browsing/core/common/safebrowsing_constants.h"
|
|
|
#include "components/safe_browsing/core/common/utils.h"
|
|
|
#include "components/security_interstitials/content/unsafe_resource_util.h"
|
|
|
-@@ -1220,14 +1219,6 @@ bool ChromePasswordProtectionService::Ha
|
|
|
+@@ -1219,14 +1218,6 @@ bool ChromePasswordProtectionService::Ha
|
|
|
}
|
|
|
|
|
|
void ChromePasswordProtectionService::OnWarningTriggerChanged() {
|
|
|
@@ -1619,7 +1610,7 @@
|
|
|
// Clears captured enterprise password hashes or GSuite sync password hashes.
|
|
|
password_manager::PasswordReuseManager* reuse_manager =
|
|
|
GetPasswordReuseManager();
|
|
|
-@@ -1385,7 +1376,7 @@ PrefService* ChromePasswordProtectionSer
|
|
|
+@@ -1384,7 +1375,7 @@ PrefService* ChromePasswordProtectionSer
|
|
|
}
|
|
|
|
|
|
bool ChromePasswordProtectionService::IsSafeBrowsingEnabled() {
|
|
|
@@ -1628,7 +1619,7 @@
|
|
|
}
|
|
|
|
|
|
bool ChromePasswordProtectionService::IsExtendedReporting() {
|
|
|
-@@ -1405,44 +1396,7 @@ bool ChromePasswordProtectionService::Is
|
|
|
+@@ -1404,44 +1395,7 @@ bool ChromePasswordProtectionService::Is
|
|
|
bool ChromePasswordProtectionService::IsPingingEnabled(
|
|
|
LoginReputationClientRequest::TriggerType trigger_type,
|
|
|
ReusedPasswordAccountType password_type) {
|
|
|
@@ -1674,7 +1665,7 @@
|
|
|
}
|
|
|
|
|
|
RequestOutcome ChromePasswordProtectionService::GetPingNotSentReason(
|
|
|
-@@ -1661,22 +1615,6 @@ MaybeCreateNavigationThrottle(content::N
|
|
|
+@@ -1665,22 +1619,6 @@ MaybeCreateNavigationThrottle(content::N
|
|
|
: nullptr;
|
|
|
}
|
|
|
|
|
|
@@ -1699,7 +1690,7 @@
|
|
|
if (!profile_)
|
|
|
--- a/chrome/browser/safe_browsing/chrome_password_protection_service.h
|
|
|
+++ b/chrome/browser/safe_browsing/chrome_password_protection_service.h
|
|
|
-@@ -211,13 +211,6 @@ class ChromePasswordProtectionService :
|
|
|
+@@ -212,13 +212,6 @@ class ChromePasswordProtectionService :
|
|
|
bool UserClickedThroughSBInterstitial(
|
|
|
PasswordProtectionRequest* request) override;
|
|
|
|
|
|
@@ -1980,7 +1971,7 @@
|
|
|
|
|
|
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
|
|
|
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
|
|
|
-@@ -74,7 +74,6 @@
|
|
|
+@@ -77,7 +77,6 @@
|
|
|
#include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h"
|
|
|
#include "components/safe_browsing/core/browser/verdict_cache_manager.h"
|
|
|
#include "components/safe_browsing/core/common/features.h"
|
|
|
@@ -1990,7 +1981,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
|
|
|
+@@ -121,7 +121,6 @@ base::FilePath SafeBrowsingService::GetB
|
|
|
|
|
|
SafeBrowsingService::SafeBrowsingService()
|
|
|
: services_delegate_(ServicesDelegate::Create(this)),
|
|
|
@@ -1998,7 +1989,7 @@
|
|
|
shutdown_(false),
|
|
|
enabled_(false),
|
|
|
enabled_by_prefs_(false) {}
|
|
|
-@@ -257,8 +256,6 @@ TriggerManager* SafeBrowsingService::tri
|
|
|
+@@ -256,8 +255,6 @@ TriggerManager* SafeBrowsingService::tri
|
|
|
|
|
|
PasswordProtectionService* SafeBrowsingService::GetPasswordProtectionService(
|
|
|
Profile* profile) const {
|
|
|
@@ -2007,7 +1998,7 @@
|
|
|
return nullptr;
|
|
|
}
|
|
|
|
|
|
-@@ -387,9 +384,6 @@ void SafeBrowsingService::OnProfileAdded
|
|
|
+@@ -381,9 +378,6 @@ void SafeBrowsingService::OnProfileAdded
|
|
|
std::unique_ptr<PrefChangeRegistrar> registrar =
|
|
|
std::make_unique<PrefChangeRegistrar>();
|
|
|
registrar->Init(pref_service);
|
|
|
@@ -2017,7 +2008,7 @@
|
|
|
// ClientSideDetectionService will need to be refresh the models
|
|
|
// renderers have if extended-reporting changes.
|
|
|
registrar->Add(prefs::kSafeBrowsingScoutReportingEnabled,
|
|
|
-@@ -418,14 +412,6 @@ void SafeBrowsingService::OnProfileAdded
|
|
|
+@@ -412,14 +406,6 @@ void SafeBrowsingService::OnProfileAdded
|
|
|
NoCachedPopulationReason::kChangeMbbPref));
|
|
|
user_population_prefs_[pref_service] = std::move(registrar);
|
|
|
|
|
|
@@ -2032,7 +2023,7 @@
|
|
|
// Extended Reporting metrics are handled together elsewhere.
|
|
|
RecordExtendedReportingMetrics(*pref_service);
|
|
|
|
|
|
-@@ -465,18 +451,6 @@ void SafeBrowsingService::RefreshState()
|
|
|
+@@ -461,18 +447,6 @@ void SafeBrowsingService::RefreshState()
|
|
|
|
|
|
// Check if any profile requires the service to be active.
|
|
|
enabled_by_prefs_ = false;
|
|
|
@@ -2077,7 +2068,7 @@
|
|
|
// Get current enabled status. Must be called on IO thread.
|
|
|
bool enabled() const {
|
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
|
|
|
-@@ -287,10 +277,6 @@ class SafeBrowsingService : public SafeB
|
|
|
+@@ -280,10 +270,6 @@ class SafeBrowsingService : public SafeB
|
|
|
// Provides phishing and malware statistics. Accessed on UI thread.
|
|
|
std::unique_ptr<PingManager> ping_manager_;
|
|
|
|
|
|
@@ -2333,17 +2324,17 @@
|
|
|
// Display the signin promo if the user is not signed in.
|
|
|
--- a/chrome/browser/signin/signin_ui_util.cc
|
|
|
+++ b/chrome/browser/signin/signin_ui_util.cc
|
|
|
-@@ -34,7 +34,6 @@
|
|
|
- #include "components/feature_engagement/public/tracker.h"
|
|
|
+@@ -35,7 +35,6 @@
|
|
|
#include "components/prefs/pref_service.h"
|
|
|
+ #include "components/signin/public/base/consent_level.h"
|
|
|
#include "components/signin/public/base/signin_metrics.h"
|
|
|
-#include "components/signin/public/base/signin_pref_names.h"
|
|
|
#include "components/signin/public/identity_manager/account_info.h"
|
|
|
#include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
|
|
|
- #include "components/signin/public/identity_manager/consent_level.h"
|
|
|
+ #include "components/signin/public/identity_manager/identity_manager.h"
|
|
|
--- a/chrome/browser/signin/signin_util.cc
|
|
|
+++ b/chrome/browser/signin/signin_util.cc
|
|
|
-@@ -30,7 +30,6 @@
|
|
|
+@@ -31,7 +31,6 @@
|
|
|
#include "components/google/core/common/google_util.h"
|
|
|
#include "components/prefs/pref_service.h"
|
|
|
#include "components/signin/public/base/signin_metrics.h"
|
|
|
@@ -2351,7 +2342,7 @@
|
|
|
#include "components/signin/public/identity_manager/identity_manager.h"
|
|
|
#include "components/signin/public/identity_manager/identity_utils.h"
|
|
|
#include "components/signin/public/identity_manager/primary_account_mutator.h"
|
|
|
-@@ -232,7 +231,7 @@ void EnsurePrimaryAccountAllowedForProfi
|
|
|
+@@ -235,7 +234,7 @@ void EnsurePrimaryAccountAllowedForProfi
|
|
|
|
|
|
CoreAccountInfo primary_account =
|
|
|
identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync);
|
|
|
@@ -2443,7 +2434,7 @@
|
|
|
}
|
|
|
--- a/chrome/browser/ssl/ssl_browsertest.cc
|
|
|
+++ b/chrome/browser/ssl/ssl_browsertest.cc
|
|
|
-@@ -94,7 +94,6 @@
|
|
|
+@@ -93,7 +93,6 @@
|
|
|
#include "components/policy/policy_constants.h"
|
|
|
#include "components/prefs/testing_pref_service.h"
|
|
|
#include "components/safe_browsing/core/common/features.h"
|
|
|
@@ -2510,7 +2501,7 @@
|
|
|
#include "content/public/browser/native_web_keyboard_event.h"
|
|
|
#include "content/public/browser/navigation_controller.h"
|
|
|
#include "content/public/browser/navigation_entry.h"
|
|
|
-@@ -184,10 +183,6 @@ BrowserCommandController::BrowserCommand
|
|
|
+@@ -202,10 +201,6 @@ BrowserCommandController::BrowserCommand
|
|
|
&BrowserCommandController::UpdateCommandsForFullscreenMode,
|
|
|
base::Unretained(this)));
|
|
|
#endif
|
|
|
@@ -2521,7 +2512,7 @@
|
|
|
|
|
|
InitCommandState();
|
|
|
|
|
|
-@@ -1526,7 +1521,7 @@ void BrowserCommandController::UpdateSho
|
|
|
+@@ -1543,7 +1538,7 @@ void BrowserCommandController::UpdateSho
|
|
|
return;
|
|
|
|
|
|
command_updater_.UpdateCommandEnabled(
|
|
|
@@ -2529,10 +2520,10 @@
|
|
|
+ IDC_SHOW_SIGNIN, false);
|
|
|
}
|
|
|
|
|
|
- // static
|
|
|
+ void BrowserCommandController::UpdateReloadStopState(bool is_loading,
|
|
|
--- a/chrome/browser/ui/browser_command_controller.h
|
|
|
+++ b/chrome/browser/ui/browser_command_controller.h
|
|
|
-@@ -211,7 +211,6 @@ class BrowserCommandController : public
|
|
|
+@@ -208,7 +208,6 @@ class BrowserCommandController : public
|
|
|
|
|
|
PrefChangeRegistrar profile_pref_registrar_;
|
|
|
PrefChangeRegistrar local_pref_registrar_;
|
|
|
@@ -2613,7 +2604,7 @@
|
|
|
// this will not include content setting exceptions set via permission
|
|
|
--- a/chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc
|
|
|
+++ b/chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc
|
|
|
-@@ -20,7 +20,6 @@
|
|
|
+@@ -19,7 +19,6 @@
|
|
|
#include "components/password_manager/core/browser/password_manager_metrics_util.h"
|
|
|
#include "components/safe_browsing/content/browser/password_protection/password_protection_test_util.h"
|
|
|
#include "components/safe_browsing/core/browser/password_protection/metrics_util.h"
|
|
|
@@ -2623,14 +2614,14 @@
|
|
|
#include "components/signin/public/identity_manager/identity_test_utils.h"
|
|
|
--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
|
|
|
+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
|
|
|
-@@ -53,7 +53,6 @@
|
|
|
- #include "chrome/grit/generated_resources.h"
|
|
|
+@@ -54,7 +54,6 @@
|
|
|
#include "chrome/grit/theme_resources.h"
|
|
|
#include "components/signin/core/browser/signin_error_controller.h"
|
|
|
+ #include "components/signin/public/base/consent_level.h"
|
|
|
-#include "components/signin/public/base/signin_pref_names.h"
|
|
|
- #include "components/signin/public/identity_manager/consent_level.h"
|
|
|
#include "components/signin/public/identity_manager/primary_account_mutator.h"
|
|
|
#include "components/strings/grit/components_strings.h"
|
|
|
+ #include "components/vector_icons/vector_icons.h"
|
|
|
@@ -501,7 +500,6 @@ void ProfileMenuView::BuildAutofillButto
|
|
|
|
|
|
void ProfileMenuView::BuildSyncInfo() {
|
|
|
@@ -2641,14 +2632,14 @@
|
|
|
signin::IdentityManager* identity_manager =
|
|
|
--- a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
|
|
|
+++ b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
|
|
|
-@@ -55,7 +55,6 @@
|
|
|
- #include "components/feature_engagement/public/tracker.h"
|
|
|
+@@ -56,7 +56,6 @@
|
|
|
#include "components/feature_engagement/test/test_tracker.h"
|
|
|
#include "components/prefs/pref_service.h"
|
|
|
+ #include "components/signin/public/base/consent_level.h"
|
|
|
-#include "components/signin/public/base/signin_pref_names.h"
|
|
|
- #include "components/signin/public/identity_manager/consent_level.h"
|
|
|
#include "components/signin/public/identity_manager/identity_test_utils.h"
|
|
|
#include "components/sync/driver/sync_service.h"
|
|
|
+ #include "components/sync/driver/sync_user_settings.h"
|
|
|
--- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
|
|
|
+++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
|
|
|
@@ -122,7 +122,6 @@ PasswordReuseModalWarningDialog::Passwor
|
|
|
@@ -2746,6 +2737,25 @@
|
|
|
#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/history/history_ui.cc
|
|
|
++++ b/chrome/browser/ui/webui/history/history_ui.cc
|
|
|
+@@ -38,7 +38,6 @@
|
|
|
+ #include "components/history_clusters/core/history_clusters_prefs.h"
|
|
|
+ #include "components/history_clusters/core/memories_features.h"
|
|
|
+ #include "components/prefs/pref_service.h"
|
|
|
+-#include "components/signin/public/base/signin_pref_names.h"
|
|
|
+ #include "components/signin/public/identity_manager/identity_manager.h"
|
|
|
+ #include "components/strings/grit/components_strings.h"
|
|
|
+ #include "content/public/browser/web_ui.h"
|
|
|
+@@ -121,8 +120,6 @@ content::WebUIDataSource* CreateHistoryU
|
|
|
+ source->AddBoolean("allowDeletingHistory", allow_deleting_history);
|
|
|
+
|
|
|
+ source->AddBoolean("isGuestSession", profile->IsGuestSession());
|
|
|
+- source->AddBoolean("isSignInAllowed",
|
|
|
+- prefs->GetBoolean(prefs::kSigninAllowed));
|
|
|
+
|
|
|
+ source->AddBoolean(kIsUserSignedInKey, IsUserSignedIn(profile));
|
|
|
+
|
|
|
--- a/chrome/browser/ui/webui/management/management_ui_handler.cc
|
|
|
+++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
|
|
|
@@ -29,7 +29,6 @@
|
|
|
@@ -2800,14 +2810,14 @@
|
|
|
#include "components/user_prefs/user_prefs.h"
|
|
|
--- a/chrome/browser/ui/webui/settings/people_handler.cc
|
|
|
+++ b/chrome/browser/ui/webui/settings/people_handler.cc
|
|
|
-@@ -41,7 +41,6 @@
|
|
|
- #include "components/prefs/pref_service.h"
|
|
|
+@@ -42,7 +42,6 @@
|
|
|
#include "components/signin/core/browser/signin_error_controller.h"
|
|
|
+ #include "components/signin/public/base/consent_level.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/consent_level.h"
|
|
|
#include "components/signin/public/identity_manager/identity_manager.h"
|
|
|
+ #include "components/signin/public/identity_manager/primary_account_mutator.h"
|
|
|
@@ -290,10 +289,6 @@ void PeopleHandler::RegisterMessages() {
|
|
|
void PeopleHandler::OnJavascriptAllowed() {
|
|
|
PrefService* prefs = profile_->GetPrefs();
|
|
|
@@ -2831,7 +2841,7 @@
|
|
|
#include "content/public/browser/browser_context.h"
|
|
|
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
|
|
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
|
|
-@@ -67,7 +67,6 @@
|
|
|
+@@ -68,7 +68,6 @@
|
|
|
#include "components/password_manager/core/browser/manage_passwords_referrer.h"
|
|
|
#include "components/password_manager/core/common/password_manager_features.h"
|
|
|
#include "components/prefs/pref_service.h"
|
|
|
@@ -2839,12 +2849,10 @@
|
|
|
#include "components/signin/public/base/signin_buildflags.h"
|
|
|
#include "components/strings/grit/components_chromium_strings.h"
|
|
|
#include "components/strings/grit/components_strings.h"
|
|
|
-@@ -1391,46 +1390,6 @@ void AddPrivacyStrings(content::WebUIDat
|
|
|
+@@ -1402,44 +1401,6 @@ void AddPrivacyStrings(content::WebUIDat
|
|
|
{"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
|
|
|
{"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
|
|
|
{"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT},
|
|
|
-- {"safeBrowsingEnableExtendedReporting",
|
|
|
-- IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING},
|
|
|
- {"safeBrowsingEnableExtendedReportingDesc",
|
|
|
- IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC},
|
|
|
- {"safeBrowsingEnhanced", IDS_SETTINGS_SAFEBROWSING_ENHANCED},
|
|
|
@@ -2886,7 +2894,7 @@
|
|
|
{"safeBrowsingSectionLabel", IDS_SETTINGS_SAFEBROWSING_SECTION_LABEL},
|
|
|
{"syncAndGoogleServicesPrivacyDescription",
|
|
|
IDS_SETTINGS_SYNC_AND_GOOGLE_SERVICES_PRIVACY_DESC_UNIFIED_CONSENT},
|
|
|
-@@ -2626,11 +2585,6 @@ void AddSiteSettingsStrings(content::Web
|
|
|
+@@ -2673,11 +2634,6 @@ void AddSiteSettingsStrings(content::Web
|
|
|
html_source->AddLocalizedStrings(kSensorsLocalizedStrings);
|
|
|
|
|
|
html_source->AddBoolean(
|
|
|
@@ -2908,7 +2916,7 @@
|
|
|
#include "content/public/browser/url_data_source.h"
|
|
|
#include "content/public/browser/web_contents.h"
|
|
|
#include "content/public/browser/web_ui.h"
|
|
|
-@@ -274,9 +273,7 @@ SettingsUI::SettingsUI(content::WebUI* w
|
|
|
+@@ -270,9 +269,7 @@ SettingsUI::SettingsUI(content::WebUI* w
|
|
|
? "enable-branding-update"
|
|
|
: "");
|
|
|
|
|
|
@@ -3363,7 +3371,7 @@
|
|
|
|
|
|
--- a/components/safe_browsing/content/browser/ui_manager.cc
|
|
|
+++ b/components/safe_browsing/content/browser/ui_manager.cc
|
|
|
-@@ -18,7 +18,6 @@
|
|
|
+@@ -17,7 +17,6 @@
|
|
|
#include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
|
|
|
#include "components/safe_browsing/core/browser/ping_manager.h"
|
|
|
#include "components/safe_browsing/core/common/features.h"
|
|
|
@@ -3441,7 +3449,7 @@
|
|
|
|
|
|
--- a/components/safe_browsing/core/browser/db/v4_local_database_manager.cc
|
|
|
+++ b/components/safe_browsing/core/browser/db/v4_local_database_manager.cc
|
|
|
-@@ -337,10 +337,9 @@ const V4LocalDatabaseManager*
|
|
|
+@@ -334,10 +334,9 @@ const V4LocalDatabaseManager*
|
|
|
scoped_refptr<V4LocalDatabaseManager> V4LocalDatabaseManager::Create(
|
|
|
const base::FilePath& base_path,
|
|
|
scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
|
|
|
@@ -3454,7 +3462,7 @@
|
|
|
std::move(io_task_runner), nullptr));
|
|
|
}
|
|
|
|
|
|
-@@ -363,14 +362,12 @@ void V4LocalDatabaseManager::CollectData
|
|
|
+@@ -360,14 +359,12 @@ void V4LocalDatabaseManager::CollectData
|
|
|
|
|
|
V4LocalDatabaseManager::V4LocalDatabaseManager(
|
|
|
const base::FilePath& base_path,
|
|
|
@@ -3469,7 +3477,7 @@
|
|
|
list_infos_(GetListInfos()),
|
|
|
task_runner_(task_runner_for_tests
|
|
|
? task_runner_for_tests
|
|
|
-@@ -1137,8 +1134,7 @@ void V4LocalDatabaseManager::SetupUpdate
|
|
|
+@@ -1119,8 +1116,7 @@ void V4LocalDatabaseManager::SetupUpdate
|
|
|
weak_factory_.GetWeakPtr());
|
|
|
|
|
|
v4_update_protocol_manager_ = V4UpdateProtocolManager::Create(
|
|
|
@@ -3491,7 +3499,7 @@
|
|
|
|
|
|
V4LocalDatabaseManager(const V4LocalDatabaseManager&) = delete;
|
|
|
V4LocalDatabaseManager& operator=(const V4LocalDatabaseManager&) = delete;
|
|
|
-@@ -108,7 +107,6 @@ class V4LocalDatabaseManager : public Sa
|
|
|
+@@ -107,7 +106,6 @@ class V4LocalDatabaseManager : public Sa
|
|
|
// Must be initialized by calling StartOnIOThread() before using.
|
|
|
V4LocalDatabaseManager(
|
|
|
const base::FilePath& base_path,
|
|
|
@@ -3499,7 +3507,7 @@
|
|
|
scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
|
|
|
scoped_refptr<base::SequencedTaskRunner> io_task_runner,
|
|
|
scoped_refptr<base::SequencedTaskRunner> task_runner_for_tests);
|
|
|
-@@ -367,10 +365,6 @@ class V4LocalDatabaseManager : public Sa
|
|
|
+@@ -366,10 +364,6 @@ class V4LocalDatabaseManager : public Sa
|
|
|
// ready to process next update.
|
|
|
DatabaseUpdatedCallback db_updated_callback_;
|
|
|
|
|
|
@@ -3741,7 +3749,7 @@
|
|
|
#include "components/safe_browsing/core/common/utils.h"
|
|
|
#include "components/unified_consent/pref_names.h"
|
|
|
#include "components/user_prefs/user_prefs.h"
|
|
|
-@@ -35,7 +34,7 @@ bool RealTimePolicyEngine::IsUserMbbOpte
|
|
|
+@@ -36,7 +35,7 @@ bool RealTimePolicyEngine::IsUserMbbOpte
|
|
|
|
|
|
// static
|
|
|
bool RealTimePolicyEngine::IsUserEpOptedIn(PrefService* pref_service) {
|
|
|
@@ -3750,7 +3758,7 @@
|
|
|
}
|
|
|
|
|
|
// static
|
|
|
-@@ -81,9 +80,7 @@ bool RealTimePolicyEngine::CanPerformEnt
|
|
|
+@@ -82,9 +81,7 @@ bool RealTimePolicyEngine::CanPerformEnt
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
@@ -3771,7 +3779,7 @@
|
|
|
#include "components/unified_consent/pref_names.h"
|
|
|
#include "net/base/ip_address.h"
|
|
|
#include "net/base/load_flags.h"
|
|
|
-@@ -61,10 +60,6 @@ RealTimeUrlLookupService::RealTimeUrlLoo
|
|
|
+@@ -59,10 +58,6 @@ RealTimeUrlLookupService::RealTimeUrlLoo
|
|
|
variations_(variations_service) {
|
|
|
pref_change_registrar_.Init(pref_service_);
|
|
|
pref_change_registrar_.Add(
|
|
|
@@ -3782,7 +3790,7 @@
|
|
|
unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled,
|
|
|
base::BindRepeating(&RealTimeUrlLookupService::OnPrefChanged,
|
|
|
base::Unretained(this)));
|
|
|
-@@ -144,7 +139,7 @@ bool RealTimeUrlLookupService::CanSendPa
|
|
|
+@@ -140,7 +135,7 @@ bool RealTimeUrlLookupService::CanSendPa
|
|
|
}
|
|
|
|
|
|
bool RealTimeUrlLookupService::CanCheckSubresourceURL() const {
|
|
|
@@ -3856,7 +3864,7 @@
|
|
|
ScheduleNextLoggingAfterInterval(base::Days(kMetricsLoggingIntervalDay));
|
|
|
}
|
|
|
|
|
|
-@@ -98,181 +78,40 @@ void SafeBrowsingMetricsCollector::Sched
|
|
|
+@@ -98,87 +78,16 @@ void SafeBrowsingMetricsCollector::Sched
|
|
|
}
|
|
|
|
|
|
void SafeBrowsingMetricsCollector::LogDailyOptInMetrics() {
|
|
|
@@ -3944,40 +3952,23 @@
|
|
|
}
|
|
|
|
|
|
absl::optional<base::Time>
|
|
|
- SafeBrowsingMetricsCollector::GetLatestEventTimestamp(EventType event_type) {
|
|
|
-- // Events are not logged when Safe Browsing is disabled.
|
|
|
+@@ -194,15 +103,7 @@ absl::optional<base::Time>
|
|
|
+ SafeBrowsingMetricsCollector::GetLatestEventTimestamp(
|
|
|
+ EventTypeFilter event_type_filter) {
|
|
|
+ // Events are not logged when Safe Browsing is disabled.
|
|
|
- SafeBrowsingState sb_state = GetSafeBrowsingState(*pref_service_);
|
|
|
- if (sb_state == SafeBrowsingState::NO_SAFE_BROWSING) {
|
|
|
return absl::nullopt;
|
|
|
- }
|
|
|
-
|
|
|
- const absl::optional<Event> event =
|
|
|
-- GetLatestEventFromEventType(GetUserState(), event_type);
|
|
|
+- GetLatestEventFromEventTypeFilter(GetUserState(), event_type_filter);
|
|
|
- return event ? absl::optional<base::Time>(event.value().timestamp)
|
|
|
- : absl::nullopt;
|
|
|
}
|
|
|
|
|
|
absl::optional<base::Time>
|
|
|
- SafeBrowsingMetricsCollector::GetLatestSecuritySensitiveEventTimestamp() {
|
|
|
-- std::vector<absl::optional<base::Time>> security_sensitive_event_times{
|
|
|
-- GetLatestEventTimestamp(SECURITY_SENSITIVE_SAFE_BROWSING_INTERSTITIAL),
|
|
|
-- GetLatestEventTimestamp(SECURITY_SENSITIVE_SSL_INTERSTITIAL),
|
|
|
-- GetLatestEventTimestamp(SECURITY_SENSITIVE_PASSWORD_PROTECTION),
|
|
|
-- GetLatestEventTimestamp(SECURITY_SENSITIVE_DOWNLOAD)};
|
|
|
- absl::optional<base::Time> latest_event_time = absl::nullopt;
|
|
|
-- for (absl::optional<base::Time> security_sensitive_event_time :
|
|
|
-- security_sensitive_event_times) {
|
|
|
-- if (!security_sensitive_event_time) {
|
|
|
-- continue;
|
|
|
-- }
|
|
|
-- if (!latest_event_time ||
|
|
|
-- (latest_event_time.value() < security_sensitive_event_time.value())) {
|
|
|
-- latest_event_time = security_sensitive_event_time;
|
|
|
-- }
|
|
|
-- }
|
|
|
- return latest_event_time;
|
|
|
- }
|
|
|
-
|
|
|
+@@ -214,60 +115,14 @@ SafeBrowsingMetricsCollector::GetLatestS
|
|
|
void SafeBrowsingMetricsCollector::AddSafeBrowsingEventAndUserStateToPref(
|
|
|
UserState user_state,
|
|
|
EventType event_type) {
|
|
|
@@ -4039,7 +4030,7 @@
|
|
|
}
|
|
|
|
|
|
absl::optional<SafeBrowsingMetricsCollector::Event>
|
|
|
-@@ -370,20 +209,7 @@ int SafeBrowsingMetricsCollector::GetEve
|
|
|
+@@ -411,20 +266,7 @@ int SafeBrowsingMetricsCollector::GetEve
|
|
|
}
|
|
|
|
|
|
UserState SafeBrowsingMetricsCollector::GetUserState() {
|
|
|
@@ -4508,7 +4499,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
|
|
|
-@@ -29,7 +29,6 @@
|
|
|
+@@ -30,7 +30,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"
|
|
|
@@ -4748,7 +4739,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"
|
|
|
-@@ -456,9 +455,7 @@ GaiaCookieManagerService::GaiaCookieMana
|
|
|
+@@ -451,9 +450,7 @@ GaiaCookieManagerService::GaiaCookieMana
|
|
|
listAccountsUnexpectedServerResponseRetried_(false),
|
|
|
external_cc_result_fetched_(false),
|
|
|
list_accounts_stale_(true) {
|
|
|
@@ -4759,7 +4750,7 @@
|
|
|
|
|
|
if (!gaia_cookie_last_list_accounts_data.empty()) {
|
|
|
if (!gaia::ParseListAccountsData(gaia_cookie_last_list_accounts_data,
|
|
|
-@@ -482,8 +479,6 @@ GaiaCookieManagerService::~GaiaCookieMan
|
|
|
+@@ -477,8 +474,6 @@ GaiaCookieManagerService::~GaiaCookieMan
|
|
|
|
|
|
// static
|
|
|
void GaiaCookieManagerService::RegisterPrefs(PrefRegistrySimple* registry) {
|
|
|
@@ -4768,7 +4759,7 @@
|
|
|
}
|
|
|
|
|
|
void GaiaCookieManagerService::InitCookieListener() {
|
|
|
-@@ -906,16 +901,12 @@ void GaiaCookieManagerService::OnListAcc
|
|
|
+@@ -896,16 +891,12 @@ void GaiaCookieManagerService::OnListAcc
|
|
|
&signed_out_accounts_)) {
|
|
|
listed_accounts_.clear();
|
|
|
signed_out_accounts_.clear();
|
|
|
@@ -5091,7 +5082,7 @@
|
|
|
#include "components/sync_preferences/testing_pref_service_syncable.h"
|
|
|
--- a/components/signin/public/base/BUILD.gn
|
|
|
+++ b/components/signin/public/base/BUILD.gn
|
|
|
-@@ -34,8 +34,6 @@ static_library("base") {
|
|
|
+@@ -35,8 +35,6 @@ static_library("base") {
|
|
|
"signin_client.h",
|
|
|
"signin_metrics.cc",
|
|
|
"signin_metrics.h",
|
|
|
@@ -5229,17 +5220,17 @@
|
|
|
namespace {
|
|
|
--- a/components/signin/public/identity_manager/primary_account_mutator_unittest.cc
|
|
|
+++ b/components/signin/public/identity_manager/primary_account_mutator_unittest.cc
|
|
|
-@@ -15,7 +15,6 @@
|
|
|
- #include "build/chromeos_buildflags.h"
|
|
|
+@@ -16,7 +16,6 @@
|
|
|
+ #include "components/signin/public/base/consent_level.h"
|
|
|
#include "components/signin/public/base/signin_buildflags.h"
|
|
|
#include "components/signin/public/base/signin_metrics.h"
|
|
|
-#include "components/signin/public/base/signin_pref_names.h"
|
|
|
- #include "components/signin/public/identity_manager/consent_level.h"
|
|
|
#include "components/signin/public/identity_manager/identity_test_environment.h"
|
|
|
#include "components/signin/public/identity_manager/identity_test_utils.h"
|
|
|
+ #include "components/sync_preferences/testing_pref_service_syncable.h"
|
|
|
--- a/tools/metrics/histograms/enums.xml
|
|
|
+++ b/tools/metrics/histograms/enums.xml
|
|
|
-@@ -83754,7 +83754,6 @@ Full version information for the fingerp
|
|
|
+@@ -84626,7 +84626,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"/>
|
|
|
@@ -5247,7 +5238,7 @@
|
|
|
<int value="7" label="kSearchProviderOverrides"/>
|
|
|
<int value="8" label="kDefaultSearchProviderSearchURL (Obsolete 12/2016)"/>
|
|
|
<int value="9" label="kDefaultSearchProviderKeyword (Obsolete 12/2016)"/>
|
|
|
-@@ -83769,10 +83768,7 @@ Full version information for the fingerp
|
|
|
+@@ -84641,10 +84640,7 @@ Full version information for the fingerp
|
|
|
<int value="18" label="kSafeBrowsingIncidentsSent"/>
|
|
|
<int value="19" label="kSwReporterPromptVersion"/>
|
|
|
<int value="20" label="kSwReporterPromptReason"/>
|
Ahrotahn