Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8721)

Unified Diff: chrome/browser/chromeos/login/enrollment/enrollment_screen.cc

Issue 2894783003: Make Hands-Off Zero-Touch Enrollment compatibile with tests (Closed)
Patch Set: Make Hands-Off Zero-Touch Enrollment compatibile with tests Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
index ee08d9c854280f997194d4f073008023401461bf..b82f94da26b8b17e9030c04594cf1e447489d995 100644
--- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
@@ -57,13 +57,6 @@ constexpr double kMultiplyFactor = 1.5;
constexpr double kJitterFactor = 0.1; // +/- 10% jitter
constexpr int64_t kMaxDelayMS = 8 * 60 * 1000; // 8 minutes
-// Helper function. Returns true if we are using Hands Off Enrollment.
-bool UsingHandsOffEnrollment() {
- return policy::DeviceCloudPolicyManagerChromeOS::
- GetZeroTouchEnrollmentMode() ==
- policy::ZeroTouchEnrollmentMode::HANDS_OFF;
-}
-
} // namespace
namespace chromeos {
@@ -284,7 +277,7 @@ void EnrollmentScreen::OnEnrollmentError(policy::EnrollmentStatus status) {
Show();
} else {
view_->ShowEnrollmentStatus(status);
- if (UsingHandsOffEnrollment())
+ if (WizardController::UsingHandsOffEnrollment())
AutomaticRetry();
}
}
@@ -293,7 +286,7 @@ void EnrollmentScreen::OnOtherError(
EnterpriseEnrollmentHelper::OtherError error) {
RecordEnrollmentErrorMetrics();
view_->ShowOtherError(error);
- if (UsingHandsOffEnrollment())
+ if (WizardController::UsingHandsOffEnrollment())
AutomaticRetry();
}
@@ -368,7 +361,7 @@ void EnrollmentScreen::ShowEnrollmentStatusOnSuccess() {
retry_backoff_->InformOfRequest(true);
if (elapsed_timer_)
UMA_ENROLLMENT_TIME(kMetricEnrollmentTimeSuccess, elapsed_timer_);
- if (UsingHandsOffEnrollment()) {
+ if (WizardController::UsingHandsOffEnrollment()) {
OnConfirmationClosed();
} else {
view_->ShowEnrollmentStatus(

Powered by Google App Engine
This is Rietveld 408576698