| Index: chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc
|
| diff --git a/chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc b/chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc
|
| index 3b056f554de15ab748f2764e3fb18fe1bcfa6575..21eece6e7b11af03b71cd0c7aca57539cefe0d7e 100644
|
| --- a/chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc
|
| +++ b/chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc
|
| @@ -70,10 +70,10 @@ void SupervisedUserLoginFlow::ConfigureSync(const std::string& token) {
|
|
|
| // TODO(antrim): add error handling (no token loaded).
|
| // See also: http://crbug.com/312751
|
| - UserManager::Get()->GetSupervisedUserManager()->ConfigureSyncWithToken(
|
| - profile_, token);
|
| + GetUserManager()->GetSupervisedUserManager()->ConfigureSyncWithToken(profile_,
|
| + token);
|
| SupervisedUserAuthentication* auth =
|
| - UserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
|
| + GetUserManager()->GetSupervisedUserManager()->GetAuthentication();
|
|
|
| if (auth->HasScheduledPasswordUpdate(user_id())) {
|
| auth->LoadPasswordUpdateData(
|
| @@ -96,7 +96,7 @@ void SupervisedUserLoginFlow::OnPasswordChangeDataLoaded(
|
| const base::DictionaryValue* password_data) {
|
| // Edge case, when manager has signed in and already updated the password.
|
| SupervisedUserAuthentication* auth =
|
| - UserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
|
| + GetUserManager()->GetSupervisedUserManager()->GetAuthentication();
|
| if (!auth->NeedPasswordChange(user_id(), password_data)) {
|
| VLOG(1) << "Password already changed for " << user_id();
|
| auth->ClearScheduledPasswordUpdate(user_id());
|
| @@ -180,7 +180,7 @@ void SupervisedUserLoginFlow::OnNewKeyAdded(
|
| scoped_ptr<base::DictionaryValue> password_data) {
|
| VLOG(1) << "New key added";
|
| SupervisedUserAuthentication* auth =
|
| - UserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
|
| + GetUserManager()->GetSupervisedUserManager()->GetAuthentication();
|
| auth->StorePasswordData(user_id(), *password_data.get());
|
| auth->MarkKeyIncomplete(user_id(), true /* incomplete */);
|
| authenticator_->RemoveKey(
|
| @@ -225,7 +225,7 @@ void SupervisedUserLoginFlow::OnPasswordUpdated(
|
| VLOG(1) << "Updated password for supervised user";
|
|
|
| SupervisedUserAuthentication* auth =
|
| - UserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
|
| + GetUserManager()->GetSupervisedUserManager()->GetAuthentication();
|
|
|
| // Incomplete state is not there in password_data, carry it from old state.
|
| bool was_incomplete = auth->HasIncompleteKey(user_id());
|
| @@ -249,11 +249,10 @@ void SupervisedUserLoginFlow::Finish() {
|
| void SupervisedUserLoginFlow::LaunchExtraSteps(
|
| Profile* profile) {
|
| profile_ = profile;
|
| - UserManager::Get()->GetSupervisedUserManager()->LoadSupervisedUserToken(
|
| + GetUserManager()->GetSupervisedUserManager()->LoadSupervisedUserToken(
|
| profile,
|
| - base::Bind(
|
| - &SupervisedUserLoginFlow::OnSyncSetupDataLoaded,
|
| - weak_factory_.GetWeakPtr()));
|
| + base::Bind(&SupervisedUserLoginFlow::OnSyncSetupDataLoaded,
|
| + weak_factory_.GetWeakPtr()));
|
| }
|
|
|
| } // namespace chromeos
|
|
|