Index: chrome/browser/chromeos/login/signin/merge_session_throttle.cc |
diff --git a/chrome/browser/chromeos/login/signin/merge_session_throttle.cc b/chrome/browser/chromeos/login/signin/merge_session_throttle.cc |
index 259e84bddeb2149107e9be5fbdf594378aa49809..1c187de6663a98d4a026725f1439308c77961935 100644 |
--- a/chrome/browser/chromeos/login/signin/merge_session_throttle.cc |
+++ b/chrome/browser/chromeos/login/signin/merge_session_throttle.cc |
@@ -164,9 +164,9 @@ bool MergeSessionThrottle::ShouldDelayRequest( |
int render_view_id) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
- if (!chromeos::UserManager::Get()->IsUserLoggedIn()) { |
+ if (!chromeos::GetUserManager()->IsUserLoggedIn()) { |
return false; |
- } else if (!chromeos::UserManager::Get()->IsLoggedInAsRegularUser()) { |
+ } else if (!chromeos::GetUserManager()->IsLoggedInAsRegularUser()) { |
// This is not a regular user session, let's remove the throttle |
// permanently. |
if (!AreAllSessionMergedAlready()) |
@@ -207,8 +207,8 @@ bool MergeSessionThrottle::ShouldDelayRequest( |
// In theory this should not happen since we should |
// kick off the session restore process for the newly added profile |
// before we attempt loading any page. |
- if (chromeos::UserManager::Get()->IsLoggedInAsRegularUser() && |
- !chromeos::UserManager::Get()->IsLoggedInAsStub()) { |
+ if (chromeos::GetUserManager()->IsLoggedInAsRegularUser() && |
+ !chromeos::GetUserManager()->IsLoggedInAsStub()) { |
LOG(WARNING) << "Loading content for a profile without " |
<< "session restore?"; |
} |