Allow the powerwash shortcut only for devices without FRE

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

Index: chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc
diff --git a/chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc b/chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc
index 915e0762c200f34c164f88f235f5ce1b7d0a2a64..69e6c8bb7fe94d0ef78d612368fb10a2e0fc7aaf 100644
--- a/chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc
+++ b/chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc
@@ -55,36 +55,6 @@ int GetSanitizedArg(const std::string& switch_name) {
   return int_value;
 }
 
-// Returns whether the auto-enrollment check is required. When
-// kCheckEnrollmentKey VPD entry is present, it is explicitly stating whether
-// the forced re-enrollment is required or not. Otherwise, for backward
-// compatibility with devices upgrading from an older version of Chrome OS, the
-// kActivateDateKey VPD entry is queried. If it's missing, FRE is not required.
-// This enables factories to start full guest sessions for testing, see
-// http://crbug.com/397354 for more context. The requirement for the machine
-// serial number to be present is a sanity-check to ensure that the VPD has
-// actually been read successfully. If VPD read failed, the FRE check is
-// required.
-AutoEnrollmentController::FRERequirement GetFRERequirement() {
-  std::string check_enrollment_value;
-  system::StatisticsProvider* provider =
-      system::StatisticsProvider::GetInstance();
-  bool fre_flag_found = provider->GetMachineStatistic(
-      system::kCheckEnrollmentKey, &check_enrollment_value);
-
-  if (fre_flag_found) {
-    if (check_enrollment_value == "0")
-      return AutoEnrollmentController::EXPLICITLY_NOT_REQUIRED;
-    if (check_enrollment_value == "1")
-      return AutoEnrollmentController::EXPLICITLY_REQUIRED;
-  }
-  if (!provider->GetMachineStatistic(system::kActivateDateKey, nullptr) &&
-      !provider->GetEnterpriseMachineID().empty()) {
-    return AutoEnrollmentController::NOT_REQUIRED;
-  }
-  return AutoEnrollmentController::REQUIRED;
-}
-
 std::string FRERequirementToString(
     AutoEnrollmentController::FRERequirement requirement) {
   switch (requirement) {
@@ -136,6 +106,27 @@ AutoEnrollmentController::Mode AutoEnrollmentController::GetMode() {
   return MODE_NONE;
 }
 
+AutoEnrollmentController::FRERequirement
+AutoEnrollmentController::GetFRERequirement() {

[Andrew T Wilson (Slow), 2017/05/23 05:32:06]

I'm not a huge fan of moving code around unnecessarily - I'm going to presume
that:

a) You're doing this because of some uncontrollable impulse to keep the .h
declarations in the same order as the definitions in the .cc file.

b) and that you didn't actually change the code.

If either of these aren't the case, please let me know.

[igorcov, 2017/05/23 09:28:49]

I need this function to be visible from outside, so I put it as a static member
of the class. In the previous version is was a global function. The code inside
the function didn't change.

+  std::string check_enrollment_value;
+  system::StatisticsProvider* provider =
+      system::StatisticsProvider::GetInstance();
+  bool fre_flag_found = provider->GetMachineStatistic(
+      system::kCheckEnrollmentKey, &check_enrollment_value);
+
+  if (fre_flag_found) {
+    if (check_enrollment_value == "0")
+      return AutoEnrollmentController::EXPLICITLY_NOT_REQUIRED;
+    if (check_enrollment_value == "1")
+      return AutoEnrollmentController::EXPLICITLY_REQUIRED;
+  }
+  if (!provider->GetMachineStatistic(system::kActivateDateKey, nullptr) &&
+      !provider->GetEnterpriseMachineID().empty()) {
+    return AutoEnrollmentController::NOT_REQUIRED;
+  }
+  return AutoEnrollmentController::REQUIRED;
+}
+
 AutoEnrollmentController::AutoEnrollmentController() {}
 
 AutoEnrollmentController::~AutoEnrollmentController() {}