| Index: chrome/browser/profiles/profile_manager.cc
|
| diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
|
| index fae8756ec5ab3e0fc76e0052a844c7ab0fea3599..a8e3a8034663cce78b77ab8aaf37f76873bafe87 100644
|
| --- a/chrome/browser/profiles/profile_manager.cc
|
| +++ b/chrome/browser/profiles/profile_manager.cc
|
| @@ -129,7 +129,7 @@
|
| #include "components/user_manager/user_manager.h"
|
| #endif
|
|
|
| -#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_CHROMEOS)
|
| +#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
|
| #include "chrome/browser/profiles/profile_statistics.h"
|
| #include "chrome/browser/profiles/profile_statistics_factory.h"
|
| #endif
|
| @@ -337,7 +337,7 @@ bool IsProfileEphemeral(ProfileAttributesStorage* storage,
|
| }
|
| #endif
|
|
|
| -#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_CHROMEOS)
|
| +#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
|
| void SignOut(SigninManager* signin_manager) {
|
| signin_manager->SignOut(
|
| signin_metrics::AUTHENTICATION_FAILED_WITH_FORCE_SIGNIN,
|
| @@ -1566,12 +1566,12 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
|
| bool has_entry = storage.GetProfileAttributesWithPath(profile->GetPath(),
|
| &entry);
|
| if (has_entry) {
|
| -#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_CHROMEOS)
|
| +#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
|
| bool was_authenticated_status = entry->IsAuthenticated();
|
| #endif
|
| // The ProfileAttributesStorage's info must match the Signin Manager.
|
| entry->SetAuthInfo(account_info.gaia, username);
|
| -#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_CHROMEOS)
|
| +#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
|
| // Sign out if force-sign-in policy is enabled and profile is not signed
|
| // in.
|
| if (signin_util::IsForceSigninEnabled() && was_authenticated_status &&
|
|
|