Various supervised user password fixes - 2

chrome/browser/managed_mode/chromeos/manager_password_service.cc

Index: chrome/browser/managed_mode/chromeos/manager_password_service.cc
diff --git a/chrome/browser/managed_mode/chromeos/manager_password_service.cc b/chrome/browser/managed_mode/chromeos/manager_password_service.cc
index e6d2070758dd95b93a82b2d97eea4bafde8938f7..1e4e20f7be3c77a4a6e8f9fd08ab8659f92aa440 100644
--- a/chrome/browser/managed_mode/chromeos/manager_password_service.cc
+++ b/chrome/browser/managed_mode/chromeos/manager_password_service.cc
@@ -192,6 +192,11 @@ void ManagerPasswordService::OnAddKeySuccess(
       UserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
   int old_schema = auth->GetPasswordSchema(user_id);
   auth->StorePasswordData(user_id, *password_data.get());
+  if (auth->HasIncompleteKey(user_id)) {

[Bernhard Bauer, 2014/04/02 14:05:28]

From looking at the rest of the code in this file, leaving out braces for
single-line bodies seems more common.

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

nit: drop {}

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

nit: Please add comment that you're essentially marking this as complete now.

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

Done.

+    auth->MarkKeyIncomplete(user_id, false);

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

nit: false /* incomplete */

+  }
+  // Check if we have legacy labels for keys.

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

nit: Insert empty line.

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

Done.

+  // TODO(antrim): migrate it to GetLabels call once wad@ implement it.

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

nit: Capitalize comment.

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

Done.

   if (old_schema == SupervisedUserAuthentication::SCHEMA_PLAIN) {
     // 1) Add new manager key (using old key).
     // 2) Remove old supervised user key.