Various supervised user password fixes - 2

chrome/browser/managed_mode/chromeos/manager_password_service.cc

 // Copyright 2014 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/managed_mode/chromeos/manager_password_service.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/managed/locally_managed_user_constants.h"
@@ skipping 174 matching lines @@
   VLOG(0) << "Password changed for " << user_id;
   UMA_HISTOGRAM_ENUMERATION(
       "ManagedUsers.ChromeOS.PasswordChange",
       SupervisedUserAuthentication::PASSWORD_CHANGED_IN_MANAGER_SESSION,
       SupervisedUserAuthentication::PASSWORD_CHANGE_RESULT_MAX_VALUE);
 
   SupervisedUserAuthentication* auth =
       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.
     // 3) Remove old manager key.
     authenticator_->TransformContext(
         master_key_context,
         base::Bind(&ManagerPasswordService::OnContextTransformed,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 }
@@ skipping 42 matching lines @@
 void ManagerPasswordService::OnOldManagerKeyDeleted(
     const UserContext& master_key_context) {
   VLOG(1) << "Removed old master key for " << master_key_context.username;
 }
 
 void ManagerPasswordService::Shutdown() {
   settings_service_subscription_.reset();
 }
 
 }  // namespace chromeos