diff options
Diffstat (limited to 'chromium/components/signin/core/browser/signin_manager.cc')
| -rw-r--r-- | chromium/components/signin/core/browser/signin_manager.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chromium/components/signin/core/browser/signin_manager.cc b/chromium/components/signin/core/browser/signin_manager.cc index 2791801d2dc..ffbfa714068 100644 --- a/chromium/components/signin/core/browser/signin_manager.cc +++ b/chromium/components/signin/core/browser/signin_manager.cc @@ -214,7 +214,7 @@ void SigninManager::DoSignOut( return; } - if (prohibit_signout_) { + if (IsSignoutProhibited()) { DVLOG(1) << "Ignoring attempt to sign out while signout is prohibited"; return; } @@ -232,6 +232,9 @@ void SigninManager::DoSignOut( client_->GetPrefs()->ClearPref(prefs::kGoogleServicesAccountId); client_->GetPrefs()->ClearPref(prefs::kGoogleServicesUserAccountId); client_->GetPrefs()->ClearPref(prefs::kSignedInTime); +#if defined(OS_IOS) || defined(OS_ANDROID) + client_->RecreateSigninScopedDeviceId(); +#endif client_->SignOut(); // Determine the duration the user was logged in and log that to UMA. @@ -393,7 +396,7 @@ void SigninManager::DisableOneClickSignIn(PrefService* prefs) { } void SigninManager::MergeSigninCredentialIntoCookieJar() { - if (!client_->ShouldMergeSigninCredentialsIntoCookieJar()) + if (account_consistency_ == signin::AccountConsistencyMethod::kMirror) return; if (!IsAuthenticated()) |