| Index: chrome/browser/chromeos/login/login_utils.cc
|
| diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
|
| index b96563636549e6ca8a6c372ec7416a80b39ddd3f..1006b08679815fa4ff7b96d2d76529db7844edca 100644
|
| --- a/chrome/browser/chromeos/login/login_utils.cc
|
| +++ b/chrome/browser/chromeos/login/login_utils.cc
|
| @@ -498,7 +498,7 @@ void LoginUtilsImpl::CompleteProfileCreate(Profile* user_profile) {
|
|
|
| void LoginUtilsImpl::RestoreAuthSession(Profile* user_profile,
|
| bool restore_from_auth_cookies) {
|
| - CHECK((authenticator_ && authenticator_->authentication_profile()) ||
|
| + CHECK((authenticator_.get() && authenticator_->authentication_profile()) ||
|
| !restore_from_auth_cookies);
|
| if (!login_manager_.get())
|
| return;
|
| @@ -514,9 +514,9 @@ void LoginUtilsImpl::RestoreAuthSession(Profile* user_profile,
|
| // all other tokens and user_context.
|
| login_manager_->RestoreSession(
|
| user_profile,
|
| - authenticator_ && authenticator_->authentication_profile() ?
|
| - authenticator_->authentication_profile()->GetRequestContext() :
|
| - NULL,
|
| + authenticator_.get() && authenticator_->authentication_profile()
|
| + ? authenticator_->authentication_profile()->GetRequestContext()
|
| + : NULL,
|
| session_restore_strategy_,
|
| oauth2_refresh_token_,
|
| user_context_.auth_code);
|
| @@ -722,12 +722,12 @@ scoped_refptr<Authenticator> LoginUtilsImpl::CreateAuthenticator(
|
| LoginStatusConsumer* consumer) {
|
| // Screen locker needs new Authenticator instance each time.
|
| if (ScreenLocker::default_screen_locker()) {
|
| - if (authenticator_)
|
| + if (authenticator_.get())
|
| authenticator_->SetConsumer(NULL);
|
| authenticator_ = NULL;
|
| }
|
|
|
| - if (authenticator_ == NULL) {
|
| + if (authenticator_.get() == NULL) {
|
| authenticator_ = new ParallelAuthenticator(consumer);
|
| } else {
|
| // TODO(nkostylev): Fix this hack by improving Authenticator dependencies.
|
|
|