Rename MachineLevelUserCloudPolicyRegisterWatcher

Change MachineLevelUserCloudPolicyRegisterWatcher to
ChromeBrowserCloudManagementRegisterWatcher

Bug: 1010704
Change-Id: I864d3427b7e4f79ba180706755c489049922e8b4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1854225
Commit-Queue: Owen Min <zmin@chromium.org>
Reviewed-by: Roger Tawa <rogerta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706577}

chrome/browser/BUILD.gn

@@ -4046,6 +4046,8 @@ jumbo_split_static_library("browser") {
       "notifications/screen_lock_notification_blocker.cc",
       "notifications/screen_lock_notification_blocker.h",
       "platform_util.cc",
+      "policy/chrome_browser_cloud_management_register_watcher.cc",
+      "policy/chrome_browser_cloud_management_register_watcher.h",
       "policy/cloud/chrome_browser_cloud_management_helper.cc",
       "policy/cloud/chrome_browser_cloud_management_helper.h",
       "policy/cloud/user_policy_signin_service.cc",
@@ -4053,8 +4055,6 @@ jumbo_split_static_library("browser") {
       "policy/cloud/user_policy_signin_service_internal.h",
       "policy/machine_level_user_cloud_policy_controller.cc",
       "policy/machine_level_user_cloud_policy_controller.h",
-      "policy/machine_level_user_cloud_policy_register_watcher.cc",
-      "policy/machine_level_user_cloud_policy_register_watcher.h",
       "profiles/avatar_menu.cc",
       "profiles/avatar_menu.h",
       "profiles/avatar_menu_actions_desktop.cc",

chrome/browser/policy/machine_level_user_cloud_policy_register_watcher.cc → chrome/browser/policy/chrome_browser_cloud_management_register_watcher.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/policy/machine_level_user_cloud_policy_register_watcher.h"
+#include "chrome/browser/policy/chrome_browser_cloud_management_register_watcher.h"
 
 #include <utility>
 
@@ -20,21 +20,21 @@ namespace policy {
 using RegisterResult = MachineLevelUserCloudPolicyController::RegisterResult;
 
 const char
-    MachineLevelUserCloudPolicyRegisterWatcher::kStartupDialogHistogramName[] =
+    ChromeBrowserCloudManagementRegisterWatcher::kStartupDialogHistogramName[] =
         "Enterprise.MachineLevelUserCloudPolicyEnrollment.StartupDialog";
 
-MachineLevelUserCloudPolicyRegisterWatcher::
-    MachineLevelUserCloudPolicyRegisterWatcher(
+ChromeBrowserCloudManagementRegisterWatcher::
+    ChromeBrowserCloudManagementRegisterWatcher(
         MachineLevelUserCloudPolicyController* controller)
     : controller_(controller) {
   controller_->AddObserver(this);
 }
-MachineLevelUserCloudPolicyRegisterWatcher::
-    ~MachineLevelUserCloudPolicyRegisterWatcher() {
+ChromeBrowserCloudManagementRegisterWatcher::
+    ~ChromeBrowserCloudManagementRegisterWatcher() {
   controller_->RemoveObserver(this);
 }
 
-RegisterResult MachineLevelUserCloudPolicyRegisterWatcher::
+RegisterResult ChromeBrowserCloudManagementRegisterWatcher::
     WaitUntilCloudPolicyEnrollmentFinished() {
   BrowserDMTokenStorage* token_storage = BrowserDMTokenStorage::Get();
 
@@ -46,7 +46,7 @@ RegisterResult MachineLevelUserCloudPolicyRegisterWatcher::
     return RegisterResult::kEnrollmentSuccessBeforeDialogDisplayed;
 
   EnterpriseStartupDialog::DialogResultCallback callback = base::BindOnce(
-      &MachineLevelUserCloudPolicyRegisterWatcher::OnDialogClosed,
+      &ChromeBrowserCloudManagementRegisterWatcher::OnDialogClosed,
       base::Unretained(this));
   if (dialog_creation_callback_)
     dialog_ = std::move(dialog_creation_callback_).Run(std::move(callback));
@@ -77,11 +77,11 @@ RegisterResult MachineLevelUserCloudPolicyRegisterWatcher::
 
   if (!token_storage->ShouldDisplayErrorMessageOnFailure() &&
       register_result_) {
-    SYSLOG(ERROR) << "Machine level user cloud policy enrollment has failed.";
+    SYSLOG(ERROR) << "Chrome browser cloud management enrollment has failed.";
     return RegisterResult::kEnrollmentFailedSilently;
   }
 
-  SYSLOG(ERROR) << "Can not start Chrome as machine level user cloud policy "
+  SYSLOG(ERROR) << "Can not start Chrome as chrome browser cloud management "
                    "enrollment has failed. Please double check network "
                    "connection and the status of enrollment token then open "
                    "Chrome again.";
@@ -91,22 +91,22 @@ RegisterResult MachineLevelUserCloudPolicyRegisterWatcher::
   return RegisterResult::kQuitDueToFailure;
 }
 
-bool MachineLevelUserCloudPolicyRegisterWatcher::IsDialogShowing() {
+bool ChromeBrowserCloudManagementRegisterWatcher::IsDialogShowing() {
   return (dialog_ && dialog_->IsShowing()) || run_loop_.running();
 }
 
-void MachineLevelUserCloudPolicyRegisterWatcher::
+void ChromeBrowserCloudManagementRegisterWatcher::
     SetDialogCreationCallbackForTesting(DialogCreationCallback callback) {
   dialog_creation_callback_ = std::move(callback);
 }
 
 // static
-void MachineLevelUserCloudPolicyRegisterWatcher::RecordEnrollmentStartDialog(
+void ChromeBrowserCloudManagementRegisterWatcher::RecordEnrollmentStartDialog(
     EnrollmentStartupDialog dialog_startup) {
   UMA_HISTOGRAM_ENUMERATION(kStartupDialogHistogramName, dialog_startup);
 }
 
-void MachineLevelUserCloudPolicyRegisterWatcher::OnPolicyRegisterFinished(
+void ChromeBrowserCloudManagementRegisterWatcher::OnPolicyRegisterFinished(
     bool succeeded) {
   register_result_ = succeeded;
 
@@ -123,7 +123,7 @@ void MachineLevelUserCloudPolicyRegisterWatcher::OnPolicyRegisterFinished(
   }
 }
 
-void MachineLevelUserCloudPolicyRegisterWatcher::OnDialogClosed(
+void ChromeBrowserCloudManagementRegisterWatcher::OnDialogClosed(
     bool is_accepted,
     bool can_show_browser_window) {
   if (can_show_browser_window) {
@@ -157,7 +157,7 @@ void MachineLevelUserCloudPolicyRegisterWatcher::OnDialogClosed(
   run_loop_.Quit();
 }
 
-void MachineLevelUserCloudPolicyRegisterWatcher::DisplayErrorMessage() {
+void ChromeBrowserCloudManagementRegisterWatcher::DisplayErrorMessage() {
   dialog_->DisplayErrorMessage(
       l10n_util::GetStringUTF16(
           IDS_ENTERPRISE_STARTUP_CLOUD_POLICY_ENROLLMENT_ERROR),

chrome/browser/policy/machine_level_user_cloud_policy_register_watcher.h → chrome/browser/policy/chrome_browser_cloud_management_register_watcher.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_POLICY_MACHINE_LEVEL_USER_CLOUD_POLICY_REGISTER_WATCHER_H_
-#define CHROME_BROWSER_POLICY_MACHINE_LEVEL_USER_CLOUD_POLICY_REGISTER_WATCHER_H_
+#ifndef CHROME_BROWSER_POLICY_CHROME_BROWSER_CLOUD_MANAGEMENT_REGISTER_WATCHER_H_
+#define CHROME_BROWSER_POLICY_CHROME_BROWSER_CLOUD_MANAGEMENT_REGISTER_WATCHER_H_
 
 #include <memory>
 #include <string>
@@ -17,24 +17,24 @@
 #include "chrome/browser/policy/machine_level_user_cloud_policy_controller.h"
 #include "chrome/browser/ui/enterprise_startup_dialog.h"
 
-class MachineLevelUserCloudPolicyRegisterWatcherTest;
+class ChromeBrowserCloudManagementRegisterWatcherTest;
 
 namespace policy {
 
-// Watches the status of machine level user cloud policy enrollment.
+// Watches the status of chrome browser cloud management enrollment.
 // Shows the blocking dialog for ongoing enrollment and failed enrollment.
-class MachineLevelUserCloudPolicyRegisterWatcher
+class ChromeBrowserCloudManagementRegisterWatcher
     : public MachineLevelUserCloudPolicyController::Observer {
  public:
   using DialogCreationCallback =
       base::OnceCallback<std::unique_ptr<EnterpriseStartupDialog>(
           EnterpriseStartupDialog::DialogResultCallback)>;
 
-  explicit MachineLevelUserCloudPolicyRegisterWatcher(
+  explicit ChromeBrowserCloudManagementRegisterWatcher(
       MachineLevelUserCloudPolicyController* controller);
-  ~MachineLevelUserCloudPolicyRegisterWatcher() override;
+  ~ChromeBrowserCloudManagementRegisterWatcher() override;
 
-  // Blocks until the machine level user cloud policy enrollment process
+  // Blocks until the  chrome browser cloud management enrollment process
   // finishes. Returns the result of enrollment.
   MachineLevelUserCloudPolicyController::RegisterResult
   WaitUntilCloudPolicyEnrollmentFinished();
@@ -45,25 +45,25 @@ class MachineLevelUserCloudPolicyRegisterWatcher
   void SetDialogCreationCallbackForTesting(DialogCreationCallback callback);
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(MachineLevelUserCloudPolicyRegisterWatcherTest,
+  FRIEND_TEST_ALL_PREFIXES(ChromeBrowserCloudManagementRegisterWatcherTest,
                            EnrollmentSucceed);
-  FRIEND_TEST_ALL_PREFIXES(MachineLevelUserCloudPolicyRegisterWatcherTest,
+  FRIEND_TEST_ALL_PREFIXES(ChromeBrowserCloudManagementRegisterWatcherTest,
                            EnrollmentSucceedWithNoErrorMessageSetup);
-  FRIEND_TEST_ALL_PREFIXES(MachineLevelUserCloudPolicyRegisterWatcherTest,
+  FRIEND_TEST_ALL_PREFIXES(ChromeBrowserCloudManagementRegisterWatcherTest,
                            EnrollmentFailedAndQuit);
-  FRIEND_TEST_ALL_PREFIXES(MachineLevelUserCloudPolicyRegisterWatcherTest,
+  FRIEND_TEST_ALL_PREFIXES(ChromeBrowserCloudManagementRegisterWatcherTest,
                            EnrollmentFailedAndRestart);
-  FRIEND_TEST_ALL_PREFIXES(MachineLevelUserCloudPolicyRegisterWatcherTest,
+  FRIEND_TEST_ALL_PREFIXES(ChromeBrowserCloudManagementRegisterWatcherTest,
                            EnrollmentCanceledBeforeFinish);
   FRIEND_TEST_ALL_PREFIXES(
-      MachineLevelUserCloudPolicyRegisterWatcherTest,
+      ChromeBrowserCloudManagementRegisterWatcherTest,
       EnrollmentCanceledBeforeFinishWithNoErrorMessageSetup);
-  FRIEND_TEST_ALL_PREFIXES(MachineLevelUserCloudPolicyRegisterWatcherTest,
+  FRIEND_TEST_ALL_PREFIXES(ChromeBrowserCloudManagementRegisterWatcherTest,
                            EnrollmentFailedBeforeDialogDisplay);
-  FRIEND_TEST_ALL_PREFIXES(MachineLevelUserCloudPolicyRegisterWatcherTest,
+  FRIEND_TEST_ALL_PREFIXES(ChromeBrowserCloudManagementRegisterWatcherTest,
                            EnrollmentFailedWithoutErrorMessage);
   FRIEND_TEST_ALL_PREFIXES(
-      MachineLevelUserCloudPolicyRegisterWatcherTest,
+      ChromeBrowserCloudManagementRegisterWatcherTest,
       EnrollmentFailedBeforeDialogDisplayWithoutErrorMessage);
 
   // Enum used with kStartupDialogHistogramName.
@@ -119,9 +119,9 @@ class MachineLevelUserCloudPolicyRegisterWatcher
 
   base::Time visible_start_time_;
 
-  DISALLOW_COPY_AND_ASSIGN(MachineLevelUserCloudPolicyRegisterWatcher);
+  DISALLOW_COPY_AND_ASSIGN(ChromeBrowserCloudManagementRegisterWatcher);
 };
 
 }  // namespace policy
 
-#endif  // CHROME_BROWSER_POLICY_MACHINE_LEVEL_USER_CLOUD_POLICY_REGISTER_WATCHER_H_
+#endif  // CHROME_BROWSER_POLICY_CHROME_BROWSER_CLOUD_MANAGEMENT_REGISTER_WATCHER_H_

chrome/browser/policy/machine_level_user_cloud_policy_controller.cc

@@ -23,9 +23,9 @@
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/net/system_network_context_manager.h"
 #include "chrome/browser/policy/browser_dm_token_storage.h"
+#include "chrome/browser/policy/chrome_browser_cloud_management_register_watcher.h"
 #include "chrome/browser/policy/chrome_browser_policy_connector.h"
 #include "chrome/browser/policy/cloud/chrome_browser_cloud_management_helper.h"
-#include "chrome/browser/policy/machine_level_user_cloud_policy_register_watcher.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_paths.h"
 #include "components/policy/core/common/cloud/cloud_external_data_manager.h"
@@ -204,8 +204,8 @@ void MachineLevelUserCloudPolicyController::Init(
       url_loader_factory);
 
   if (dm_token.empty()) {
-    policy_register_watcher_ =
-        std::make_unique<MachineLevelUserCloudPolicyRegisterWatcher>(this);
+    cloud_management_register_watcher_ =
+        std::make_unique<ChromeBrowserCloudManagementRegisterWatcher>(this);
 
     enrollment_start_time_ = base::Time::Now();
 
@@ -230,9 +230,9 @@ void MachineLevelUserCloudPolicyController::Init(
 
 bool MachineLevelUserCloudPolicyController::
     WaitUntilPolicyEnrollmentFinished() {
-  if (policy_register_watcher_) {
-    switch (
-        policy_register_watcher_->WaitUntilCloudPolicyEnrollmentFinished()) {
+  if (cloud_management_register_watcher_) {
+    switch (cloud_management_register_watcher_
+                ->WaitUntilCloudPolicyEnrollmentFinished()) {
       case RegisterResult::kNoEnrollmentNeeded:
       case RegisterResult::kEnrollmentSuccessBeforeDialogDisplayed:
       case RegisterResult::kEnrollmentFailedSilentlyBeforeDialogDisplayed:
@@ -263,8 +263,8 @@ void MachineLevelUserCloudPolicyController::RemoveObserver(Observer* observer) {
 }
 
 bool MachineLevelUserCloudPolicyController::IsEnterpriseStartupDialogShowing() {
-  return policy_register_watcher_ &&
-         policy_register_watcher_->IsDialogShowing();
+  return cloud_management_register_watcher_ &&
+         cloud_management_register_watcher_->IsDialogShowing();
 }
 
 void MachineLevelUserCloudPolicyController::NotifyPolicyRegisterFinished(

chrome/browser/policy/machine_level_user_cloud_policy_controller.h

@@ -29,7 +29,7 @@ class ChromeBrowserCloudManagementRegistrar;
 class ConfigurationPolicyProvider;
 class MachineLevelUserCloudPolicyManager;
 class MachineLevelUserCloudPolicyFetcher;
-class MachineLevelUserCloudPolicyRegisterWatcher;
+class ChromeBrowserCloudManagementRegisterWatcher;
 
 // A class that setups and manages MachineLevelUserCloudPolicy.
 class MachineLevelUserCloudPolicyController {
@@ -109,8 +109,8 @@ class MachineLevelUserCloudPolicyController {
   std::unique_ptr<MachineLevelUserCloudPolicyFetcher> policy_fetcher_;
     // This is an observer of the controller and needs to be declared after the
     // |observers_|.
-  std::unique_ptr<MachineLevelUserCloudPolicyRegisterWatcher>
-      policy_register_watcher_;
+  std::unique_ptr<ChromeBrowserCloudManagementRegisterWatcher>
+      cloud_management_register_watcher_;
 
   // Time at which the enrollment process was started.  Used to log UMA metric.
   base::Time enrollment_start_time_;

chrome/test/BUILD.gn

@@ -4964,7 +4964,7 @@ test("unit_tests") {
     sources += [
       "../browser/media/webrtc/native_desktop_media_list_unittest.cc",
       "../browser/metrics/upgrade_metrics_provider_unittest.cc",
-      "../browser/policy/machine_level_user_cloud_policy_register_watcher_unittest.cc",
+      "../browser/policy/chrome_browser_cloud_management_register_watcher_unittest.cc",
       "../browser/profiles/profile_activity_metrics_recorder_unittest.cc",
       "../browser/signin/force_signin_verifier_unittest.cc",
       "../browser/signin/signin_global_error_unittest.cc",