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

Unified Diff: chrome/browser/chromeos/arc/arc_enterprise_reporting_service.cc

Issue 2255673004: Revert of [M53 cherry-pick] Migrate ArcUserDataService into ArcAuthService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785
Patch Set: Created 4 years, 4 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/arc/arc_enterprise_reporting_service.cc
diff --git a/chrome/browser/chromeos/arc/arc_enterprise_reporting_service.cc b/chrome/browser/chromeos/arc/arc_enterprise_reporting_service.cc
index 674de876887a29222753eedc23389b02c05539a5..47babc73befea5aab51591e2da828ba3027f9aa3 100644
--- a/chrome/browser/chromeos/arc/arc_enterprise_reporting_service.cc
+++ b/chrome/browser/chromeos/arc/arc_enterprise_reporting_service.cc
@@ -38,9 +38,22 @@
if (state == mojom::ManagementState::MANAGED_DO_LOST) {
DCHECK(arc::ArcServiceManager::Get());
- ArcAuthService::Get()->RemoveArcData();
- ArcAuthService::Get()->StopAndEnableArc();
+ ArcServiceManager::Get()->arc_user_data_service()->RequireUserDataWiped(
+ base::Bind(&ArcEnterpriseReportingService::RestartArc,
+ weak_ptr_factory_.GetWeakPtr()));
+ ArcAuthService::Get()->StopArc();
}
}
+void ArcEnterpriseReportingService::RestartArc(bool result) {
+ DCHECK(thread_checker_.CalledOnValidThread());
+ if (!result)
+ LOG(ERROR) << "Required ARC user data wipe failed.";
+
+ // Restart ARC anyway. Let the enterprise reporting instance decide whether
+ // the ARC user data wipe is still required or not.
+ VLOG(1) << "Restart ARC";
+ ArcAuthService::Get()->EnableArc();
+}
+
} // namespace arc
« no previous file with comments | « chrome/browser/chromeos/arc/arc_enterprise_reporting_service.h ('k') | chrome/browser/ui/app_list/arc/arc_app_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698