Skip to content

Commit

Permalink
Rename EnrollmentHandlerChromeOS to EnrollmentHandler
Browse files Browse the repository at this point in the history
This CL removes 'ChromeOS' suffix from EnrollmentHandlerChromeOS
because the class is under ash/ directory and not an implementation
of a generic enrollment interface.

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

Bug: 1164001
Change-Id: I6958b0a763fd250ccd2d39fe2185c5630656b1d9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3056142
Reviewed-by: Sergey Poromov <poromov@chromium.org>
Commit-Queue: Yeunjoo Choi <ychoi@igalia.com>
Cr-Commit-Position: refs/heads/master@{#906969}
  • Loading branch information
duswnchl authored and Chromium LUCI CQ committed Jul 30, 2021
1 parent 743ef0b commit 98e3ffa
Show file tree
Hide file tree
Showing 8 changed files with 75 additions and 81 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ using OnDomainJoinedCallback =

// Delegate being used during enterprise enrollment to start Active Directory
// domain join flow. This is needed because we have to start the join flow from
// inside EnrollmentHandlerChromeOS and enrollment screen is not available
// there.
// inside EnrollmentHandler and enrollment screen is not available there.
class ActiveDirectoryJoinDelegate {
public:
ActiveDirectoryJoinDelegate() = default;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ class DeviceCloudPolicyManagerAshTest
manager_->Init(&schema_registry_);

// SharedURLLoaderFactory and LocalState singletons have to be set since
// they are accessed by EnrollmentHandlerChromeOS and StartupUtils.
// they are accessed by EnrollmentHandler and StartupUtils.
TestingBrowserProcess::GetGlobal()->SetSharedURLLoaderFactory(
test_url_loader_factory_.GetSafeWeakWrapper());
TestingBrowserProcess::GetGlobal()->SetLocalState(&local_state_);
Expand Down Expand Up @@ -660,7 +660,7 @@ class DeviceCloudPolicyManagerAshEnrollmentTest
AllowUninterestingRemoteCommandFetches();

// Process robot refresh token fetch if the auth code fetch succeeded.
// DeviceCloudPolicyInitializer holds an EnrollmentHandlerChromeOS which
// DeviceCloudPolicyInitializer holds an EnrollmentHandler which
// holds a GaiaOAuthClient that fetches the refresh token during enrollment.
// We return a successful OAuth response via a TestURLLoaderFactory to
// trigger the happy path for these classes so that enrollment can continue.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.h"
#include "chrome/browser/ash/policy/core/device_cloud_policy_store_ash.h"
#include "chrome/browser/ash/policy/enrollment/enrollment_config.h"
#include "chrome/browser/ash/policy/enrollment/enrollment_handler_chromeos.h"
#include "chrome/browser/ash/policy/enrollment/enrollment_handler.h"
#include "chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.h"
#include "chrome/browser/ash/policy/server_backed_state/server_backed_device_state.h"
#include "chrome/browser/ash/policy/status_collector/device_status_collector.h"
Expand Down Expand Up @@ -127,7 +127,7 @@ void DeviceCloudPolicyInitializer::PrepareEnrollment(

policy_manager_->core()->Disconnect();

enrollment_handler_ = std::make_unique<EnrollmentHandlerChromeOS>(
enrollment_handler_ = std::make_unique<EnrollmentHandler>(
policy_store_, install_attributes_, state_keys_broker_,
attestation_flow_.get(), CreateClient(device_management_service),
background_task_runner_, ad_join_delegate, enrollment_config,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class DeviceCloudPolicyManagerAsh;
class DeviceCloudPolicyStoreAsh;
class DeviceManagementService;
struct EnrollmentConfig;
class EnrollmentHandlerChromeOS;
class EnrollmentHandler;
class EnrollmentStatus;

// The |DeviceCloudPolicyInitializer| is a helper class which calls
Expand Down Expand Up @@ -201,7 +201,7 @@ class DeviceCloudPolicyInitializer : public CloudPolicyStore::Observer {
bool is_initialized_ = false;

// Non-NULL if there is an enrollment operation pending.
std::unique_ptr<EnrollmentHandlerChromeOS> enrollment_handler_;
std::unique_ptr<EnrollmentHandler> enrollment_handler_;

base::CallbackListSubscription state_keys_update_subscription_;

Expand Down

0 comments on commit 98e3ffa

Please sign in to comment.