| Index: chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
|
| diff --git a/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc b/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
|
| index 88fb88413e8c4289ff418b34f654458bf805899b..0bf5be6668c6df059da32dc049857251fef3ca62 100644
|
| --- a/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
|
| +++ b/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
|
| @@ -16,8 +16,8 @@
|
| #include "chrome/grit/theme_resources.h"
|
| #include "chromeos/chromeos_switches.h"
|
| #include "chromeos/login/login_state.h"
|
| -#include "chromeos/login/user_names.h"
|
| #include "components/user_manager/user_image/user_image.h"
|
| +#include "components/user_manager/user_names.h"
|
| #include "components/user_manager/user_type.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "ui/gfx/image/image_skia.h"
|
| @@ -229,7 +229,7 @@ bool FakeChromeUserManager::GetPlatformKnownUserId(
|
| }
|
|
|
| const AccountId& FakeChromeUserManager::GetGuestAccountId() const {
|
| - return login::GuestAccountId();
|
| + return user_manager::GuestAccountId();
|
| }
|
|
|
| bool FakeChromeUserManager::IsFirstExecAfterBoot() const {
|
| @@ -244,17 +244,17 @@ void FakeChromeUserManager::AsyncRemoveCryptohome(
|
|
|
| bool FakeChromeUserManager::IsGuestAccountId(
|
| const AccountId& account_id) const {
|
| - return account_id == login::GuestAccountId();
|
| + return account_id == user_manager::GuestAccountId();
|
| }
|
|
|
| bool FakeChromeUserManager::IsStubAccountId(const AccountId& account_id) const {
|
| - return account_id == login::StubAccountId();
|
| + return account_id == user_manager::StubAccountId();
|
| }
|
|
|
| bool FakeChromeUserManager::IsSupervisedAccountId(
|
| const AccountId& account_id) const {
|
| return gaia::ExtractDomainName(account_id.GetUserEmail()) ==
|
| - chromeos::login::kSupervisedUserDomain;
|
| + user_manager::kSupervisedUserDomain;
|
| }
|
|
|
| bool FakeChromeUserManager::HasBrowserRestarted() const {
|
|
|