Index: chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc |
diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc |
index 4cdadd90a87de5d3e3facfbb2d952fdaa1dde5a5..14e52554c88e229b853ade2f9272cb49ef37491c 100644 |
--- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc |
+++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc |
@@ -109,7 +109,7 @@ ChromeUserManagerImpl::ChromeUserManagerImpl() |
UpdateNumberOfUsers(); |
// UserManager instance should be used only on UI thread. |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
registrar_.Add(this, |
chrome::NOTIFICATION_OWNERSHIP_STATUS_CHANGED, |
content::NotificationService::AllSources()); |
@@ -156,7 +156,7 @@ ChromeUserManagerImpl::~ChromeUserManagerImpl() { |
} |
void ChromeUserManagerImpl::Shutdown() { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
ChromeUserManager::Shutdown(); |
local_accounts_subscription_.reset(); |
@@ -289,7 +289,7 @@ user_manager::UserList ChromeUserManagerImpl::GetUnlockUsers() const { |
} |
void ChromeUserManagerImpl::SessionStarted() { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
ChromeUserManager::SessionStarted(); |
content::NotificationService::current()->Notify( |
@@ -328,7 +328,7 @@ void ChromeUserManagerImpl::RemoveUserInternal( |
void ChromeUserManagerImpl::SaveUserOAuthStatus( |
const std::string& user_id, |
user_manager::User::OAuthTokenStatus oauth_token_status) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
ChromeUserManager::SaveUserOAuthStatus(user_id, oauth_token_status); |
GetUserFlow(user_id)->HandleOAuthTokenStatusChange(oauth_token_status); |
@@ -337,7 +337,7 @@ void ChromeUserManagerImpl::SaveUserOAuthStatus( |
void ChromeUserManagerImpl::SaveUserDisplayName( |
const std::string& user_id, |
const base::string16& display_name) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
ChromeUserManager::SaveUserDisplayName(user_id, display_name); |
// Do not update local state if data stored or cached outside the user's |
@@ -624,7 +624,7 @@ void ChromeUserManagerImpl::RetrieveTrustedDevicePolicies() { |
} |
void ChromeUserManagerImpl::GuestUserLoggedIn() { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
ChromeUserManager::GuestUserLoggedIn(); |
// TODO(nkostylev): Add support for passing guest session cryptohome |
@@ -657,7 +657,7 @@ void ChromeUserManagerImpl::RegularUserLoggedIn(const std::string& user_id) { |
void ChromeUserManagerImpl::RegularUserLoggedInAsEphemeral( |
const std::string& user_id) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
ChromeUserManager::RegularUserLoggedInAsEphemeral(user_id); |
GetUserImageManager(user_id)->UserLoggedIn(IsCurrentUserNew(), false); |
@@ -721,7 +721,7 @@ void ChromeUserManagerImpl::PublicAccountUserLoggedIn( |
} |
void ChromeUserManagerImpl::KioskAppLoggedIn(const std::string& app_id) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
policy::DeviceLocalAccount::Type device_local_account_type; |
DCHECK(policy::IsDeviceLocalAccountUser(app_id, &device_local_account_type)); |
DCHECK_EQ(policy::DeviceLocalAccount::TYPE_KIOSK_APP, |
@@ -770,7 +770,7 @@ void ChromeUserManagerImpl::KioskAppLoggedIn(const std::string& app_id) { |
} |
void ChromeUserManagerImpl::DemoAccountLoggedIn() { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
active_user_ = |
user_manager::User::CreateKioskAppUser(DemoAppLauncher::kDemoUserName); |
active_user_->SetStubImage( |
@@ -793,7 +793,7 @@ void ChromeUserManagerImpl::DemoAccountLoggedIn() { |
} |
void ChromeUserManagerImpl::NotifyOnLogin() { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
UserSessionManager::OverrideHomedir(); |
UpdateNumberOfUsers(); |
@@ -981,14 +981,14 @@ void ChromeUserManagerImpl::UpdatePublicAccountDisplayName( |
} |
UserFlow* ChromeUserManagerImpl::GetCurrentUserFlow() const { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
if (!IsUserLoggedIn()) |
return GetDefaultUserFlow(); |
return GetUserFlow(GetLoggedInUser()->email()); |
} |
UserFlow* ChromeUserManagerImpl::GetUserFlow(const std::string& user_id) const { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
FlowMap::const_iterator it = specific_flows_.find(user_id); |
if (it != specific_flows_.end()) |
return it->second; |
@@ -997,13 +997,13 @@ UserFlow* ChromeUserManagerImpl::GetUserFlow(const std::string& user_id) const { |
void ChromeUserManagerImpl::SetUserFlow(const std::string& user_id, |
UserFlow* flow) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
ResetUserFlow(user_id); |
specific_flows_[user_id] = flow; |
} |
void ChromeUserManagerImpl::ResetUserFlow(const std::string& user_id) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
FlowMap::iterator it = specific_flows_.find(user_id); |
if (it != specific_flows_.end()) { |
delete it->second; |
@@ -1019,7 +1019,7 @@ bool ChromeUserManagerImpl::AreSupervisedUsersAllowed() const { |
} |
UserFlow* ChromeUserManagerImpl::GetDefaultUserFlow() const { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
if (!default_flow_.get()) |
default_flow_.reset(new DefaultUserFlow()); |
return default_flow_.get(); |