Reland "Enable Auto Re-Enrollment on Chromad"
This is a reland of b5ae0d8d6935dfc75e8776a8873586e8f1f828de
As described in crbug.com/1267853,some of the unit tests added in the
original CL were failing with use-after-free crashes on "Linux
ChromiumOS MSan Tests" builders. The issue was fixed by releasing the
uploader_, before calling ash::DeviceSettingsTestBase::TearDown(). This
prevents the uploader from accessing device_settings_service_ after it
has been deallocated.
Original change's description:
> Enable Auto Re-Enrollment on Chromad
>
> Upload the enrollment ID (EID) to DMServer. This enables Auto
> Re-Enrollment (Auto RE) on Chromad. Forced Re-enrollment (FRE) is
> already supported on Chromad but the devices are currently just required
> to be manually re-enrolled to the same domain.
>
> Also, add a local state boolean preference that indicates whether the
> enrollment ID has already being uploaded or not - used on Chromad only.
> This pref is used to cease attempting to upload the EID.
>
> Bug: 1248117
> Change-Id: Ib354822245cf2dd02e40855bf9e5b4fbe3d0ef3b
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3178972
> Commit-Queue: Felipe Andrade <[email protected]>
> Reviewed-by: Roman Sorokin [CET] <[email protected]>
> Reviewed-by: Colin Blundell <[email protected]>
> Reviewed-by: Maksim Ivanov <[email protected]>
> Cr-Commit-Position: refs/heads/main@{#939114}
Bug: 1248117, 1267853
Change-Id: Ia04c6bd0d00db245b45cf6ad1397a87ce2fe8647
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3268132
Reviewed-by: Maksim Ivanov <[email protected]>
Reviewed-by: Colin Blundell <[email protected]>
Reviewed-by: Roman Sorokin [CET] <[email protected]>
Commit-Queue: Felipe Andrade <[email protected]>
Cr-Commit-Position: refs/heads/main@{#939635}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index b28c55f..eefd6cf 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -341,6 +341,7 @@
#include "chrome/browser/ash/policy/reporting/app_install_event_log_manager_wrapper.h"
#include "chrome/browser/ash/policy/reporting/arc_app_install_event_logger.h"
#include "chrome/browser/ash/policy/reporting/extension_install_event_log_manager_wrapper.h"
+#include "chrome/browser/ash/policy/server_backed_state/active_directory_device_state_uploader.h"
#include "chrome/browser/ash/policy/status_collector/device_status_collector.h"
#include "chrome/browser/ash/policy/status_collector/status_collector.h"
#include "chrome/browser/ash/power/auto_screen_brightness/metrics_reporter.h"
@@ -1061,6 +1062,7 @@
registry);
extensions::login_api::RegisterLocalStatePrefs(registry);
::onc::RegisterPrefs(registry);
+ policy::ActiveDirectoryDeviceStateUploader::RegisterLocalStatePrefs(registry);
policy::AdbSideloadingAllowanceModePolicyHandler::RegisterPrefs(registry);
policy::AutoEnrollmentClientImpl::RegisterPrefs(registry);
policy::BrowserPolicyConnectorAsh::RegisterPrefs(registry);
