Improve variable name - Chrome OS OOBE

Changes the name of a variable used in the enterprise enrollment
screen in OOBE. 'last_auth_' was replaced with 'next_auth_'. The
author intention with 'last_auth_' was probably 'last_auth_to_try_'.
'next_auth_' makes it easier to understand the code's logic.

Change-Id: If1b8ffbfc17767b5a4a4f725856522338231f32b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1939805
Auto-Submit: Renato Silva <rrsilva@google.com>
Reviewed-by: Yves Arrouye <drcrash@chromium.org>
Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737261}

chrome/browser/chromeos/login/enrollment/enrollment_screen.cc

@@ -135,15 +135,15 @@ void EnrollmentScreen::SetEnrollmentConfig(
   switch (enrollment_config_.auth_mechanism) {
     case EnrollmentConfig::AUTH_MECHANISM_INTERACTIVE:
       current_auth_ = AUTH_OAUTH;
-      last_auth_ = AUTH_OAUTH;
+      next_auth_ = AUTH_OAUTH;
       break;
     case EnrollmentConfig::AUTH_MECHANISM_ATTESTATION:
       current_auth_ = AUTH_ATTESTATION;
-      last_auth_ = AUTH_ATTESTATION;
+      next_auth_ = AUTH_ATTESTATION;
       break;
     case EnrollmentConfig::AUTH_MECHANISM_BEST_AVAILABLE:
       current_auth_ = AUTH_ATTESTATION;
-      last_auth_ = enrollment_config_.should_enroll_interactively()
+      next_auth_ = enrollment_config_.should_enroll_interactively()
                        ? AUTH_OAUTH
                        : AUTH_ATTESTATION;
       break;
@@ -173,10 +173,10 @@ void EnrollmentScreen::SetConfig() {
 }
 
 bool EnrollmentScreen::AdvanceToNextAuth() {
-  if (current_auth_ != last_auth_ && current_auth_ == AUTH_ATTESTATION) {
+  if (current_auth_ != next_auth_ && current_auth_ == AUTH_ATTESTATION) {
     LOG(WARNING) << "User stopped using auth: " << current_auth_
-                 << ", current auth: " << last_auth_ << ".";
-    current_auth_ = last_auth_;
+                 << ", current auth: " << next_auth_ << ".";
+    current_auth_ = next_auth_;
     SetConfig();
     return true;
   }
@@ -518,7 +518,7 @@ void EnrollmentScreen::ShowSigninScreen() {
 void EnrollmentScreen::RecordEnrollmentErrorMetrics() {
   enrollment_failed_once_ = true;
   //  TODO(crbug.com/896793): Have other metrics for each auth mechanism.
-  if (elapsed_timer_ && current_auth_ == last_auth_)
+  if (elapsed_timer_ && current_auth_ == next_auth_)
     UMA_ENROLLMENT_TIME(kMetricEnrollmentTimeFailure, elapsed_timer_);
 }
 

chrome/browser/chromeos/login/enrollment/enrollment_screen.h

@@ -184,8 +184,11 @@ class EnrollmentScreen
   ScreenExitCallback exit_callback_;
   policy::EnrollmentConfig config_;
   policy::EnrollmentConfig enrollment_config_;
+
+  // 'Current' and 'Next' authentication mechanisms to be used.
   Auth current_auth_ = AUTH_OAUTH;
-  Auth last_auth_ = AUTH_OAUTH;
+  Auth next_auth_ = AUTH_OAUTH;
+
   bool enrollment_failed_once_ = false;
   bool enrollment_succeeded_ = false;
   std::string enrolling_user_domain_;