Commit 516ae38a authored by Yann Dago's avatar Yann Dago Committed by Commit Bot

Make BrowserCloudManagementStatusProvider::IsManaged non blocking.

BrowserCloudManagementStatusProvider::IsManaged was using
policy::BrowserDMTokenStorage::RetrieveDMToken to determine if the
browser was managed, and that call was making some blocking I/O, now we
look at the existence of a MachineLevelUserCloudPolicyManager.
MachineLevelUserCloudPolicyManager will be created only if the browser
is managed by CBCM.


Bug: 1150377
Change-Id: I3ec4b165577ffac864c5f2a5045d53b21196e3a7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2547327
Commit-Queue: Yann Dago <ydago@chromium.org>
Reviewed-by: default avatarJulian Pastarmov <pastarmovj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#831028}
parent f153f6fb
...@@ -22,8 +22,13 @@ BrowserCloudManagementStatusProvider::~BrowserCloudManagementStatusProvider() = ...@@ -22,8 +22,13 @@ BrowserCloudManagementStatusProvider::~BrowserCloudManagementStatusProvider() =
default; default;
bool BrowserCloudManagementStatusProvider::IsManaged() { bool BrowserCloudManagementStatusProvider::IsManaged() {
#if !defined(OS_ANDROID) #if defined(OS_CHROMEOS)
return policy::BrowserDMTokenStorage::Get()->RetrieveDMToken().is_valid(); return policy::BrowserDMTokenStorage::Get()->RetrieveDMToken().is_valid();
#elif !defined(OS_ANDROID)
// A machine level user cloud policy manager is only created if the browser is
// managed by CBCM.
return g_browser_process->browser_policy_connector()
->machine_level_user_cloud_policy_manager() != nullptr;
#else #else
return false; return false;
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment