| Index: chrome/browser/notifications/message_center_settings_controller.cc
|
| diff --git a/chrome/browser/notifications/message_center_settings_controller.cc b/chrome/browser/notifications/message_center_settings_controller.cc
|
| index 69e9ca9a6a39969b1e1c1b12b9e8f40656992793..0d68cde0733c155ac78ad62e17abf36fb7546f8f 100644
|
| --- a/chrome/browser/notifications/message_center_settings_controller.cc
|
| +++ b/chrome/browser/notifications/message_center_settings_controller.cc
|
| @@ -142,7 +142,7 @@ MessageCenterSettingsController::MessageCenterSettingsController(
|
| #if defined(OS_CHROMEOS)
|
| // UserManager may not exist in some tests.
|
| if (chromeos::UserManager::IsInitialized())
|
| - chromeos::UserManager::Get()->AddSessionStateObserver(this);
|
| + chromeos::GetUserManager()->AddSessionStateObserver(this);
|
| #endif
|
| }
|
|
|
| @@ -150,7 +150,7 @@ MessageCenterSettingsController::~MessageCenterSettingsController() {
|
| #if defined(OS_CHROMEOS)
|
| // UserManager may not exist in some tests.
|
| if (chromeos::UserManager::IsInitialized())
|
| - chromeos::UserManager::Get()->RemoveSessionStateObserver(this);
|
| + chromeos::GetUserManager()->RemoveSessionStateObserver(this);
|
| #endif
|
| }
|
|
|
| @@ -451,7 +451,7 @@ void MessageCenterSettingsController::CreateNotifierGroupForGuestLogin() {
|
| if (!notifier_groups_.empty())
|
| return;
|
|
|
| - chromeos::UserManager* user_manager = chromeos::UserManager::Get();
|
| + chromeos::UserManager* user_manager = chromeos::GetUserManager();
|
| // |notifier_groups_| can be empty in login screen too.
|
| if (!user_manager->IsLoggedInAsGuest())
|
| return;
|
| @@ -493,7 +493,7 @@ void MessageCenterSettingsController::RebuildNotifierGroups() {
|
| // Allows the active user only.
|
| // UserManager may not exist in some tests.
|
| if (chromeos::UserManager::IsInitialized()) {
|
| - chromeos::UserManager* user_manager = chromeos::UserManager::Get();
|
| + chromeos::UserManager* user_manager = chromeos::GetUserManager();
|
| if (chromeos::ProfileHelper::Get()->GetUserByProfile(group->profile()) !=
|
| user_manager->GetActiveUser()) {
|
| continue;
|
| @@ -513,7 +513,7 @@ void MessageCenterSettingsController::RebuildNotifierGroups() {
|
| // ChromeOS guest login cannot get the profile from the for-loop above, so
|
| // get the group here.
|
| if (notifier_groups_.empty() && chromeos::UserManager::IsInitialized() &&
|
| - chromeos::UserManager::Get()->IsLoggedInAsGuest()) {
|
| + chromeos::GetUserManager()->IsLoggedInAsGuest()) {
|
| // Do not invoke CreateNotifierGroupForGuestLogin() directly. In some tests,
|
| // this method may be called before the primary profile is created, which
|
| // means ProfileHelper::Get()->GetProfileByUser() will create a new primary
|
|
|