Commit 954e6514 authored by Owen Min's avatar Owen Min Committed by Commit Bot

Rename IsChromeBrowserCloudManagementEnabled

Rename ChromeBrowserCloudManagementController
::IsMachineLevelUserCloudPolicyEnabled to
ChromeBrowserCloudManagementController
::IsEnabled

Use a shorter name to avoid repetition.

Bug: 1010704
Change-Id: If6808b2687099c09edd20a3161c7144875ba5a7e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1865407Reviewed-by: default avatarDaniel Rubery <drubery@chromium.org>
Reviewed-by: default avatarRoger Tawa <rogerta@chromium.org>
Commit-Queue: Owen Min <zmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708413}
parent 7ab9ed47
...@@ -421,8 +421,7 @@ void SafeBrowsingPrivateEventRouter::InitRealtimeReportingClient() { ...@@ -421,8 +421,7 @@ void SafeBrowsingPrivateEventRouter::InitRealtimeReportingClient() {
// policy::BrowserDMTokenStorage::Get()->RetrieveDMToken() doesn't return a // policy::BrowserDMTokenStorage::Get()->RetrieveDMToken() doesn't return a
// valid token either. Once these are fixed the #if !defined can be removed. // valid token either. Once these are fixed the #if !defined can be removed.
if (!policy::ChromeBrowserCloudManagementController:: if (!policy::ChromeBrowserCloudManagementController::IsEnabled()) {
IsMachineLevelUserCloudPolicyEnabled()) {
return; return;
} }
......
...@@ -86,8 +86,7 @@ const base::FilePath::CharType ...@@ -86,8 +86,7 @@ const base::FilePath::CharType
ChromeBrowserCloudManagementController::kPolicyDir[] = ChromeBrowserCloudManagementController::kPolicyDir[] =
FILE_PATH_LITERAL("Policy"); FILE_PATH_LITERAL("Policy");
bool ChromeBrowserCloudManagementController:: bool ChromeBrowserCloudManagementController::IsEnabled() {
IsMachineLevelUserCloudPolicyEnabled() {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING) #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
return true; return true;
#else #else
...@@ -105,7 +104,7 @@ ChromeBrowserCloudManagementController:: ...@@ -105,7 +104,7 @@ ChromeBrowserCloudManagementController::
std::unique_ptr<MachineLevelUserCloudPolicyManager> std::unique_ptr<MachineLevelUserCloudPolicyManager>
ChromeBrowserCloudManagementController::CreatePolicyManager( ChromeBrowserCloudManagementController::CreatePolicyManager(
ConfigurationPolicyProvider* platform_provider) { ConfigurationPolicyProvider* platform_provider) {
if (!IsMachineLevelUserCloudPolicyEnabled()) if (!IsEnabled())
return nullptr; return nullptr;
std::string enrollment_token = std::string enrollment_token =
...@@ -153,7 +152,7 @@ ChromeBrowserCloudManagementController::CreatePolicyManager( ...@@ -153,7 +152,7 @@ ChromeBrowserCloudManagementController::CreatePolicyManager(
void ChromeBrowserCloudManagementController::Init( void ChromeBrowserCloudManagementController::Init(
PrefService* local_state, PrefService* local_state,
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory) { scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory) {
if (!IsMachineLevelUserCloudPolicyEnabled()) if (!IsEnabled())
return; return;
base::PostTask( base::PostTask(
......
...@@ -69,7 +69,7 @@ class ChromeBrowserCloudManagementController { ...@@ -69,7 +69,7 @@ class ChromeBrowserCloudManagementController {
// The Chrome browser cloud management is only enabled on Chrome by default. // The Chrome browser cloud management is only enabled on Chrome by default.
// However, it can be enabled on Chromium by command line switch for test and // However, it can be enabled on Chromium by command line switch for test and
// development purpose. // development purpose.
static bool IsMachineLevelUserCloudPolicyEnabled(); static bool IsEnabled();
ChromeBrowserCloudManagementController(); ChromeBrowserCloudManagementController();
virtual ~ChromeBrowserCloudManagementController(); virtual ~ChromeBrowserCloudManagementController();
......
...@@ -434,8 +434,8 @@ std::string DeepScanningDialogDelegate::GetDMToken() { ...@@ -434,8 +434,8 @@ std::string DeepScanningDialogDelegate::GetDMToken() {
// policy::BrowserDMTokenStorage::Get()->RetrieveDMToken() does not return a // policy::BrowserDMTokenStorage::Get()->RetrieveDMToken() does not return a
// valid token either. Once these are fixed the #if !defined can be removed. // valid token either. Once these are fixed the #if !defined can be removed.
if (dm_token.empty() && policy::ChromeBrowserCloudManagementController:: if (dm_token.empty() &&
IsMachineLevelUserCloudPolicyEnabled()) { policy::ChromeBrowserCloudManagementController::IsEnabled()) {
dm_token = policy::BrowserDMTokenStorage::Get()->RetrieveDMToken(); dm_token = policy::BrowserDMTokenStorage::Get()->RetrieveDMToken();
} }
#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