Various supervised user password fixes - 2

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

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 d28681f09e7d3af4a102f3f161c7c2983a62eaa1..e48c0114df3b4cdd93e0eec374c71df09f478c6c 100644
--- a/chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc
+++ b/chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc
@@ -111,7 +111,7 @@ void SupervisedUserLoginFlow::OnPasswordChangeDataLoaded(
   int revision = 0;
   int schema = 0;
   bool success = password_data->GetStringWithoutPathExpansion(
-      kPasswordSignatureKey, &base64_signature);
+      kPasswordSignature, &base64_signature);
   success &= password_data->GetIntegerWithoutPathExpansion(kPasswordRevision,
                                                            &revision);
   success &=
@@ -181,7 +181,7 @@ void SupervisedUserLoginFlow::OnNewKeyAdded(
   SupervisedUserAuthentication* auth =
       UserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
   auth->StorePasswordData(user_id(), *password_data.get());
-  auth->MarkKeyIncomplete(user_id());
+  auth->MarkKeyIncomplete(user_id(), true);

[Nikita (slow), 2014/04/02 14:18:20]

nit: true /* incomplete */

[Denis Kuznetsov (DE-MUC), 2014/04/02 14:48:51]

Done.

   authenticator_->RemoveKey(
       context_,
       kLegacyCryptohomeManagedUserKeyLabel,
@@ -230,7 +230,7 @@ void SupervisedUserLoginFlow::OnPasswordUpdated(
   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);

[Nikita (slow), 2014/04/02 14:18:20]

nit: true /* incomplete */

[Denis Kuznetsov (DE-MUC), 2014/04/02 14:48:51]

Done.

 
   UMA_HISTOGRAM_ENUMERATION(
       "ManagedUsers.ChromeOS.PasswordChange",