Various supervised user password fixes - 2

chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/managed/supervised_user_login_flow.h"
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_registry_simple.h"
@@ skipping 93 matching lines @@
   }
 
   // Two cases now - we can currently have either old-style password, or new
   // password.
   std::string base64_signature;
   std::string signature;
   std::string password;
   int revision = 0;
   int schema = 0;
   bool success = password_data->GetStringWithoutPathExpansion(
-      kPasswordSignatureKey, &base64_signature);
+      kPasswordSignature, &base64_signature);
   success &= password_data->GetIntegerWithoutPathExpansion(kPasswordRevision,
                                                            &revision);
   success &=
       password_data->GetIntegerWithoutPathExpansion(kSchemaVersion, &schema);
   success &= password_data->GetStringWithoutPathExpansion(kEncryptedPassword,
                                                           &password);
   if (!success) {
     LOG(ERROR) << "Incomplete data for password change";
 
     UMA_HISTOGRAM_ENUMERATION(
@@ skipping 49 matching lines @@
     NOTREACHED() << "Unsupported password schema";
   }
 }
 
 void SupervisedUserLoginFlow::OnNewKeyAdded(
     scoped_ptr<base::DictionaryValue> password_data) {
   VLOG(1) << "New key added";
   SupervisedUserAuthentication* auth =
       UserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
   auth->StorePasswordData(user_id(), *password_data.get());
-  auth->MarkKeyIncomplete(user_id());
+  auth->MarkKeyIncomplete(user_id(), true /* incomplete */);
   authenticator_->RemoveKey(
       context_,
       kLegacyCryptohomeManagedUserKeyLabel,
       base::Bind(&SupervisedUserLoginFlow::OnOldKeyRemoved,
                  weak_factory_.GetWeakPtr()));
 }
 
 void SupervisedUserLoginFlow::OnOldKeyRemoved() {
   UMA_HISTOGRAM_ENUMERATION(
       "ManagedUsers.ChromeOS.PasswordChange",
@@ skipping 28 matching lines @@
     scoped_ptr<base::DictionaryValue> password_data) {
   VLOG(1) << "Updated password for supervised user";
 
   SupervisedUserAuthentication* auth =
       UserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
 
   // Incomplete state is not there in password_data, carry it from old state.
   bool was_incomplete = auth->HasIncompleteKey(user_id());
   auth->StorePasswordData(user_id(), *password_data.get());
   if (was_incomplete)
-    auth->MarkKeyIncomplete(user_id());
+    auth->MarkKeyIncomplete(user_id(), true /* incomplete */);
 
   UMA_HISTOGRAM_ENUMERATION(
       "ManagedUsers.ChromeOS.PasswordChange",
       SupervisedUserAuthentication::PASSWORD_CHANGED_IN_USER_SESSION,
       SupervisedUserAuthentication::PASSWORD_CHANGE_RESULT_MAX_VALUE);
   Finish();
 }
 
 void SupervisedUserLoginFlow::Finish() {
   LoginUtils::Get()->DoBrowserLaunch(profile_, host());
   profile_ = NULL;
   UnregisterFlowSoon();
 }
 
 void SupervisedUserLoginFlow::LaunchExtraSteps(
     Profile* profile) {
   profile_ = profile;
   UserManager::Get()->GetSupervisedUserManager()->LoadSupervisedUserToken(
       profile,
       base::Bind(
            &SupervisedUserLoginFlow::OnSyncSetupDataLoaded,
            weak_factory_.GetWeakPtr()));
 }
 
 }  // namespace chromeos