|
@@ -385,7 +385,7 @@
|
|
|
#include "components/spellcheck/browser/pref_names.h"
|
|
|
#include "components/translate/core/browser/translate_pref_names.h"
|
|
|
#include "extensions/browser/extension_pref_value_map.h"
|
|
|
-@@ -109,11 +108,6 @@ const PrefMappingEntry kPrefMapping[] =
|
|
|
+@@ -109,11 +108,6 @@ const PrefMappingEntry kPrefMapping[] =
|
|
|
APIPermissionID::kPrivacy},
|
|
|
{"doNotTrackEnabled", prefs::kEnableDoNotTrack, APIPermissionID::kPrivacy,
|
|
|
APIPermissionID::kPrivacy},
|
|
@@ -1114,7 +1114,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"
|
|
|
-@@ -2055,8 +2054,7 @@ void ProfileManager::AddProfileToStorage
|
|
|
+@@ -2057,8 +2056,7 @@ void ProfileManager::AddProfileToStorage
|
|
|
entry->SetAuthInfo(account_info.gaia, username,
|
|
|
is_consented_primary_account);
|
|
|
|
|
@@ -1124,7 +1124,7 @@
|
|
|
|
|
|
#if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
|
|
|
// Sign out if force-sign-in policy is enabled and profile is not signed
|
|
|
-@@ -2116,15 +2114,13 @@ void ProfileManager::AddProfileToStorage
|
|
|
+@@ -2118,15 +2116,13 @@ void ProfileManager::AddProfileToStorage
|
|
|
}
|
|
|
|
|
|
init_params.is_signed_in_with_credential_provider =
|
|
@@ -1626,7 +1626,7 @@
|
|
|
if (!profile_)
|
|
|
--- a/chrome/browser/safe_browsing/chrome_password_protection_service.h
|
|
|
+++ b/chrome/browser/safe_browsing/chrome_password_protection_service.h
|
|
|
-@@ -209,13 +209,6 @@ class ChromePasswordProtectionService :
|
|
|
+@@ -209,13 +209,6 @@ class ChromePasswordProtectionService :
|
|
|
bool UserClickedThroughSBInterstitial(
|
|
|
PasswordProtectionRequest* request) override;
|
|
|
|
|
@@ -1712,7 +1712,7 @@
|
|
|
|
|
|
namespace settings_api = extensions::api::settings_private;
|
|
|
|
|
|
-@@ -18,21 +17,6 @@ const char kGeneratedSafeBrowsingPref[]
|
|
|
+@@ -18,21 +17,6 @@ const char kGeneratedSafeBrowsingPref[]
|
|
|
GeneratedSafeBrowsingPref::GeneratedSafeBrowsingPref(Profile* profile)
|
|
|
: profile_(profile) {
|
|
|
user_prefs_registrar_.Init(profile->GetPrefs());
|
|
@@ -2454,7 +2454,7 @@
|
|
|
// static
|
|
|
--- a/chrome/browser/ui/browser_command_controller.h
|
|
|
+++ b/chrome/browser/ui/browser_command_controller.h
|
|
|
-@@ -207,7 +207,6 @@ class BrowserCommandController : public
|
|
|
+@@ -207,7 +207,6 @@ class BrowserCommandController : public
|
|
|
|
|
|
PrefChangeRegistrar profile_pref_registrar_;
|
|
|
PrefChangeRegistrar local_pref_registrar_;
|
|
@@ -2907,7 +2907,7 @@
|
|
|
#include "components/strings/grit/components_strings.h"
|
|
|
#include "content/public/browser/web_ui.h"
|
|
|
#include "content/public/browser/web_ui_data_source.h"
|
|
|
-@@ -115,9 +114,7 @@ void SigninErrorUI::Initialize(Browser*
|
|
|
+@@ -115,9 +114,7 @@ void SigninErrorUI::Initialize(Browser*
|
|
|
if (is_profile_blocked) {
|
|
|
source->AddLocalizedString("profileBlockedMessage",
|
|
|
IDS_OLD_PROFILES_DISABLED_MESSAGE);
|
|
@@ -4615,7 +4615,7 @@
|
|
|
signin::ConsentLevel::kSync);
|
|
|
--- a/components/signin/internal/identity_manager/primary_account_policy_manager_impl.h
|
|
|
+++ b/components/signin/internal/identity_manager/primary_account_policy_manager_impl.h
|
|
|
-@@ -50,9 +50,6 @@ class PrimaryAccountPolicyManagerImpl :
|
|
|
+@@ -50,9 +50,6 @@ class PrimaryAccountPolicyManagerImpl :
|
|
|
// profile-specific local prefs (like kGoogleServicesUsernamePattern).
|
|
|
PrefChangeRegistrar local_state_pref_registrar_;
|
|
|
|
|
@@ -4814,7 +4814,7 @@
|
|
|
#include "components/signin/public/identity_manager/identity_test_utils.h"
|
|
|
--- a/tools/metrics/histograms/enums.xml
|
|
|
+++ b/tools/metrics/histograms/enums.xml
|
|
|
-@@ -79139,7 +79139,6 @@ Full version information for the fingerp
|
|
|
+@@ -79175,7 +79175,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"/>
|
|
@@ -4822,7 +4822,7 @@
|
|
|
<int value="7" label="kSearchProviderOverrides"/>
|
|
|
<int value="8" label="kDefaultSearchProviderSearchURL (Obsolete 12/2016)"/>
|
|
|
<int value="9" label="kDefaultSearchProviderKeyword (Obsolete 12/2016)"/>
|
|
|
-@@ -79154,10 +79153,7 @@ Full version information for the fingerp
|
|
|
+@@ -79190,10 +79189,7 @@ Full version information for the fingerp
|
|
|
<int value="18" label="kSafeBrowsingIncidentsSent"/>
|
|
|
<int value="19" label="kSwReporterPromptVersion"/>
|
|
|
<int value="20" label="kSwReporterPromptReason"/>
|