Skip to content

Commit

Permalink
Rename UserCloudPolicyManagerChromeOS to UserCloudPolicyManagerAsh
Browse files Browse the repository at this point in the history
This CL renames 'ChromeOS' suffix of UserCloudPolicyManagerChromeOS to
'Ash', since it migrated to ash by https://crrev.com/c/2984700 and runs
on ash-chrome now.

This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.

Bug: 1164001
Change-Id: I3d4c2064d30d4897f2d2915079dc119c9c5b81a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3056315
Reviewed-by: Roland Bock <rbock@google.com>
Reviewed-by: Pavol Marko <pmarko@chromium.org>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Owners-Override: Hidehiko Abe <hidehiko@chromium.org>
Commit-Queue: Yeunjoo Choi <ychoi@igalia.com>
Cr-Commit-Position: refs/heads/master@{#906657}
  • Loading branch information
duswnchl authored and Chromium LUCI CQ committed Jul 29, 2021
1 parent 3cd0c78 commit 2d4ccc5
Show file tree
Hide file tree
Showing 52 changed files with 276 additions and 299 deletions.
Expand Up @@ -21,7 +21,7 @@
#include "chrome/browser/ash/cert_provisioning/cert_provisioning_common.h"
#include "chrome/browser/ash/cert_provisioning/cert_provisioning_metrics.h"
#include "chrome/browser/ash/cert_provisioning/cert_provisioning_worker.h"
#include "chrome/browser/ash/policy/core/user_cloud_policy_manager_chromeos.h"
#include "chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/chromeos/platform_keys/platform_keys_service.h"
Expand Down Expand Up @@ -53,8 +53,8 @@ const base::TimeDelta kInconsistentDataErrorRetryDelay =
base::TimeDelta::FromSeconds(30);

policy::CloudPolicyClient* GetCloudPolicyClientForUser(Profile* profile) {
policy::UserCloudPolicyManagerChromeOS* user_cloud_policy_manager =
profile->GetUserCloudPolicyManagerChromeOS();
policy::UserCloudPolicyManagerAsh* user_cloud_policy_manager =
profile->GetUserCloudPolicyManagerAsh();
if (!user_cloud_policy_manager) {
return nullptr;
}
Expand Down
8 changes: 4 additions & 4 deletions chrome/browser/ash/child_accounts/child_policy_observer.cc
Expand Up @@ -5,7 +5,7 @@
#include "chrome/browser/ash/child_accounts/child_policy_observer.h"

#include "base/timer/timer.h"
#include "chrome/browser/ash/policy/core/user_cloud_policy_manager_chromeos.h"
#include "chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.h"
#include "chrome/browser/profiles/profile.h"
#include "components/policy/core/common/cloud/cloud_policy_core.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
Expand Down Expand Up @@ -72,10 +72,10 @@ void ChildPolicyObserver::OnPolicyReady(
std::move(on_policy_ready_).Run(profile_, refresh_result_);
}

policy::UserCloudPolicyManagerChromeOS*
policy::UserCloudPolicyManagerAsh*
ChildPolicyObserver::GetUserCloudPolicyManager() {
policy::UserCloudPolicyManagerChromeOS* user_cloud_policy_manager =
profile_->GetUserCloudPolicyManagerChromeOS();
policy::UserCloudPolicyManagerAsh* user_cloud_policy_manager =
profile_->GetUserCloudPolicyManagerAsh();
DCHECK(user_cloud_policy_manager);
return user_cloud_policy_manager;
}
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/ash/child_accounts/child_policy_observer.h
Expand Up @@ -20,7 +20,7 @@ class OneShotTimer;
} // namespace base

namespace policy {
class UserCloudPolicyManagerChromeOS;
class UserCloudPolicyManagerAsh;
} // namespace policy

namespace ash {
Expand Down Expand Up @@ -72,7 +72,7 @@ class ChildPolicyObserver : public policy::CloudPolicyService::Observer {
void OnPolicyReady(InitialPolicyRefreshResult refresh_result);

// Returns user cloud policy manager for |profile_|.
policy::UserCloudPolicyManagerChromeOS* GetUserCloudPolicyManager();
policy::UserCloudPolicyManagerAsh* GetUserCloudPolicyManager();

// The result of initial policy refresh for child user.
InitialPolicyRefreshResult refresh_result_ =
Expand Down
Expand Up @@ -9,7 +9,7 @@
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/browser/ash/child_accounts/event_based_status_reporting_service_factory.h"
#include "chrome/browser/ash/child_accounts/usage_time_limit_processor.h"
#include "chrome/browser/ash/policy/core/user_cloud_policy_manager_chromeos.h"
#include "chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.h"
#include "chrome/browser/ash/policy/status_collector/child_status_collector.h"
#include "chrome/browser/ash/policy/uploading/status_uploader.h"
#include "chrome/browser/profiles/profile.h"
Expand Down Expand Up @@ -37,7 +37,7 @@ ChildStatusReportingService::ChildStatusReportingService(
Profile* profile = Profile::FromBrowserContext(context_);
// If child user is registered with DMServer and has User Policy applied, it
// should upload device status to the server.
user_cloud_policy_manager_ = profile->GetUserCloudPolicyManagerChromeOS();
user_cloud_policy_manager_ = profile->GetUserCloudPolicyManagerAsh();
if (!user_cloud_policy_manager_) {
LOG(WARNING) << "Child user is not managed by User Policy - status reports "
"cannot be uploaded to the server. ";
Expand Down
Expand Up @@ -19,7 +19,7 @@ class BrowserContext;
namespace policy {
class CloudPolicyClient;
class StatusUploader;
class UserCloudPolicyManagerChromeOS;
class UserCloudPolicyManagerAsh;
} // namespace policy

namespace ash {
Expand Down Expand Up @@ -64,7 +64,7 @@ class ChildStatusReportingService : public KeyedService {

content::BrowserContext* const context_;

policy::UserCloudPolicyManagerChromeOS* user_cloud_policy_manager_;
policy::UserCloudPolicyManagerAsh* user_cloud_policy_manager_;
};

} // namespace ash
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/ash/crosapi/browser_manager.cc
Expand Up @@ -48,7 +48,7 @@
#include "chrome/browser/ash/crosapi/test_mojo_connection_manager.h"
#include "chrome/browser/ash/policy/core/browser_policy_connector_chromeos.h"
#include "chrome/browser/ash/policy/core/device_local_account_policy_service.h"
#include "chrome/browser/ash/policy/core/user_cloud_policy_manager_chromeos.h"
#include "chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part_chromeos.h"
Expand Down Expand Up @@ -813,7 +813,7 @@ policy::CloudPolicyStore* BrowserManager::GetDeviceAccountPolicyStore() {
Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
DCHECK(profile);
policy::CloudPolicyManager* user_cloud_policy_manager =
profile->GetUserCloudPolicyManagerChromeOS();
profile->GetUserCloudPolicyManagerAsh();
if (!user_cloud_policy_manager)
return nullptr;
return user_cloud_policy_manager->core()->store();
Expand Down
Expand Up @@ -37,7 +37,7 @@
#include "chrome/browser/ash/login/users/mock_user_manager.h"
#include "chrome/browser/ash/ownership/owner_settings_service_ash_factory.h"
#include "chrome/browser/ash/policy/core/device_policy_builder.h"
#include "chrome/browser/ash/policy/core/user_cloud_policy_manager_chromeos.h"
#include "chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.h"
#include "chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/browser_process.h"
Expand Down Expand Up @@ -92,8 +92,8 @@ policy::CloudPolicyStore* GetStoreForUser(const user_manager::User* user) {
ADD_FAILURE();
return NULL;
}
policy::UserCloudPolicyManagerChromeOS* policy_manager =
profile->GetUserCloudPolicyManagerChromeOS();
policy::UserCloudPolicyManagerAsh* policy_manager =
profile->GetUserCloudPolicyManagerAsh();
if (!policy_manager) {
ADD_FAILURE();
return NULL;
Expand Down
Expand Up @@ -31,7 +31,7 @@
#include "chrome/browser/ash/login/ui/login_display_host.h"
#include "chrome/browser/ash/ownership/owner_settings_service_ash_factory.h"
#include "chrome/browser/ash/policy/core/device_policy_builder.h"
#include "chrome/browser/ash/policy/core/user_cloud_policy_manager_chromeos.h"
#include "chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.h"
#include "chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
#include "chrome/browser/profiles/profile.h"
Expand Down Expand Up @@ -80,8 +80,8 @@ policy::CloudPolicyStore* GetStoreForUser(const user_manager::User* user) {
ADD_FAILURE();
return NULL;
}
policy::UserCloudPolicyManagerChromeOS* policy_manager =
profile->GetUserCloudPolicyManagerChromeOS();
policy::UserCloudPolicyManagerAsh* policy_manager =
profile->GetUserCloudPolicyManagerAsh();
if (!policy_manager) {
ADD_FAILURE();
return NULL;
Expand Down

0 comments on commit 2d4ccc5

Please sign in to comment.