commit 9ab049e8e882b73eb45e94ffab7cdf144dbbb73a
author Roland Bock <rbock@google.com> Tue Apr 04 13:02:48 2023
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Apr 04 13:02:48 2023
tree 37d7495188b18a80bfd64e54dca09ca06659beca
parent 03443a6e826c2e04c5d8aaa9b7b6d0a544ac8b83

[M108-LTS] Reinforce FRE using FWMP.dev_disable_boot

M108 merge issues:
  chrome/browser/ash/BUILD.gn:
    In 108, ash tests are in other file is on chrome/test/BUILD.gn

  chrome/browser/ash/login/enrollment/auto_enrollment_controller.h:
    - Include conflicts
    - Conflicting forward declarations

  chrome/browser/ash/login/enrollment/auto_enrollment_controller.cc:
    AutoEnrollmentController::AutoEnrollmentController():
      psm_rlwe_client_factory_ isn't part of the initializer list in 108

    AutoEnrollmentController::StartWithSystemClockSyncState():
      - Conflicting namespaces for DetermineAutoEnrollmentCheckType()
      - DetermineAutoEnrollmentCheckType() is called with only one argument,
      change skipped.

  chrome/browser/ash/policy/enrollment/auto_enrollment_type_checker.h:
  DetermineAutoEnrollmentCheckType/GetFRERequirement():
    - statistics_provider parameter isn't present in 108

  chrome/browser/ash/policy/enrollment/auto_enrollment_type_checker.cc:
    GetFRERequirementAccordingToVPD():
    - Conflicting checks before check_enrollment_value, in 108 fre_flag_found
      is checked.
    - GetFRERequirement() has no parameters in 108
    - Conflicting declarations of (the removed) fre_vpd_requirement
    DetermineAutoEnrollmentCheckType():
    - statistics_provider parameter isn't present in 108
    - GetFRERequirement() doesn't use statistics_provider as an argument in 108

  chrome/browser/ash/policy/enrollment/auto_enrollment_type_checker_unittest.cc:
    Conflicts in multiple tests because there &fake_statistics_provider_ isn't used
    as anargument in DetermineAutoEnrollmentCheckType calls in 108

Use FWMP.dev_disable_boot as an additional signal to do FRE checks.
See go/fre-on-dev_disable_boot for details.

  - Adjusted unit tests for FWMP reading
  - Manual tests with and without FWMP.dev_disable_boot set

(cherry picked from commit 0a09ab86bd0e95fd8c263a48aec4c1f1b0b87b9b)

Bug: b/268267865
Change-Id: Icbb69f4c915bc6973675fa15309822adeeafcaed
Tests: 
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4241802
Commit-Queue: Roland Bock <rbock@google.com>
Cr-Original-Commit-Position: refs/heads/main@{#1105032}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4395982
Commit-Queue: Roger Felipe Zanoni da Silva <rzanoni@google.com>
Reviewed-by: Oleh Lamzin <lamzin@google.com>
Owners-Override: Oleh Lamzin <lamzin@google.com>
Cr-Commit-Position: refs/branch-heads/5359@{#1427}
Cr-Branched-From: 27d3765d341b09369006d030f83f582a29eb57ae-refs/heads/main@{#1058933}