Skip to content

GitLab

T
tangled
Commit f0b27a22 authored by Owen Min's avatar Owen Min Committed by Commit Bot
Browse files
Options

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: default avatarRoger Tawa <rogerta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706577}
parent 755e5ce2
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 101 deletions
chrome/browser/BUILD.gn
View file @ f0b27a22
...@@ -4046,6 +4046,8 @@ jumbo_split_static_library("browser") { ...@@ -4046,6 +4046,8 @@ jumbo_split_static_library("browser") {
"notifications/screen_lock_notification_blocker.cc", "notifications/screen_lock_notification_blocker.cc",
"notifications/screen_lock_notification_blocker.h", "notifications/screen_lock_notification_blocker.h",
"platform_util.cc", "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.cc",
"policy/cloud/chrome_browser_cloud_management_helper.h", "policy/cloud/chrome_browser_cloud_management_helper.h",
"policy/cloud/user_policy_signin_service.cc", "policy/cloud/user_policy_signin_service.cc",
...@@ -4053,8 +4055,6 @@ jumbo_split_static_library("browser") { ...@@ -4053,8 +4055,6 @@ jumbo_split_static_library("browser") {
"policy/cloud/user_policy_signin_service_internal.h", "policy/cloud/user_policy_signin_service_internal.h",
"policy/machine_level_user_cloud_policy_controller.cc", "policy/machine_level_user_cloud_policy_controller.cc",
"policy/machine_level_user_cloud_policy_controller.h", "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.cc",
"profiles/avatar_menu.h", "profiles/avatar_menu.h",
"profiles/avatar_menu_actions_desktop.cc", "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
View file @ f0b27a22
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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> #include <utility>
...@@ -20,21 +20,21 @@ namespace policy { ...@@ -20,21 +20,21 @@ namespace policy {
using RegisterResult = MachineLevelUserCloudPolicyController::RegisterResult; using RegisterResult = MachineLevelUserCloudPolicyController::RegisterResult;
const char const char
MachineLevelUserCloudPolicyRegisterWatcher::kStartupDialogHistogramName[] = ChromeBrowserCloudManagementRegisterWatcher::kStartupDialogHistogramName[] =
"Enterprise.MachineLevelUserCloudPolicyEnrollment.StartupDialog"; "Enterprise.MachineLevelUserCloudPolicyEnrollment.StartupDialog";
MachineLevelUserCloudPolicyRegisterWatcher:: ChromeBrowserCloudManagementRegisterWatcher::
MachineLevelUserCloudPolicyRegisterWatcher( ChromeBrowserCloudManagementRegisterWatcher(
MachineLevelUserCloudPolicyController* controller) MachineLevelUserCloudPolicyController* controller)
: controller_(controller) { : controller_(controller) {
controller_->AddObserver(this); controller_->AddObserver(this);
} }
MachineLevelUserCloudPolicyRegisterWatcher:: ChromeBrowserCloudManagementRegisterWatcher::
~MachineLevelUserCloudPolicyRegisterWatcher() { ~ChromeBrowserCloudManagementRegisterWatcher() {
controller_->RemoveObserver(this); controller_->RemoveObserver(this);
} }
RegisterResult MachineLevelUserCloudPolicyRegisterWatcher:: RegisterResult ChromeBrowserCloudManagementRegisterWatcher::
WaitUntilCloudPolicyEnrollmentFinished() { WaitUntilCloudPolicyEnrollmentFinished() {
BrowserDMTokenStorage* token_storage = BrowserDMTokenStorage::Get(); BrowserDMTokenStorage* token_storage = BrowserDMTokenStorage::Get();
...@@ -46,7 +46,7 @@ RegisterResult MachineLevelUserCloudPolicyRegisterWatcher:: ...@@ -46,7 +46,7 @@ RegisterResult MachineLevelUserCloudPolicyRegisterWatcher::
return RegisterResult::kEnrollmentSuccessBeforeDialogDisplayed; return RegisterResult::kEnrollmentSuccessBeforeDialogDisplayed;
EnterpriseStartupDialog::DialogResultCallback callback = base::BindOnce( EnterpriseStartupDialog::DialogResultCallback callback = base::BindOnce(
&MachineLevelUserCloudPolicyRegisterWatcher::OnDialogClosed, &ChromeBrowserCloudManagementRegisterWatcher::OnDialogClosed,
base::Unretained(this)); base::Unretained(this));
if (dialog_creation_callback_) if (dialog_creation_callback_)
dialog_ = std::move(dialog_creation_callback_).Run(std::move(callback)); dialog_ = std::move(dialog_creation_callback_).Run(std::move(callback));
...@@ -77,11 +77,11 @@ RegisterResult MachineLevelUserCloudPolicyRegisterWatcher:: ...@@ -77,11 +77,11 @@ RegisterResult MachineLevelUserCloudPolicyRegisterWatcher::
if (!token_storage->ShouldDisplayErrorMessageOnFailure() && if (!token_storage->ShouldDisplayErrorMessageOnFailure() &&
register_result_) { register_result_) {
SYSLOG(ERROR) << "Machine level user cloud policy enrollment has failed."; SYSLOG(ERROR) << "Chrome browser cloud management enrollment has failed.";
return RegisterResult::kEnrollmentFailedSilently; 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 " "enrollment has failed. Please double check network "
"connection and the status of enrollment token then open " "connection and the status of enrollment token then open "
"Chrome again."; "Chrome again.";
...@@ -91,22 +91,22 @@ RegisterResult MachineLevelUserCloudPolicyRegisterWatcher:: ...@@ -91,22 +91,22 @@ RegisterResult MachineLevelUserCloudPolicyRegisterWatcher::
return RegisterResult::kQuitDueToFailure; return RegisterResult::kQuitDueToFailure;
} }
bool MachineLevelUserCloudPolicyRegisterWatcher::IsDialogShowing() { bool ChromeBrowserCloudManagementRegisterWatcher::IsDialogShowing() {
return (dialog_ && dialog_->IsShowing()) || run_loop_.running(); return (dialog_ && dialog_->IsShowing()) || run_loop_.running();
} }
void MachineLevelUserCloudPolicyRegisterWatcher:: void ChromeBrowserCloudManagementRegisterWatcher::
SetDialogCreationCallbackForTesting(DialogCreationCallback callback) { SetDialogCreationCallbackForTesting(DialogCreationCallback callback) {
dialog_creation_callback_ = std::move(callback); dialog_creation_callback_ = std::move(callback);
} }
// static // static
void MachineLevelUserCloudPolicyRegisterWatcher::RecordEnrollmentStartDialog( void ChromeBrowserCloudManagementRegisterWatcher::RecordEnrollmentStartDialog(
EnrollmentStartupDialog dialog_startup) { EnrollmentStartupDialog dialog_startup) {
UMA_HISTOGRAM_ENUMERATION(kStartupDialogHistogramName, dialog_startup); UMA_HISTOGRAM_ENUMERATION(kStartupDialogHistogramName, dialog_startup);
} }
void MachineLevelUserCloudPolicyRegisterWatcher::OnPolicyRegisterFinished( void ChromeBrowserCloudManagementRegisterWatcher::OnPolicyRegisterFinished(
bool succeeded) { bool succeeded) {
register_result_ = succeeded; register_result_ = succeeded;
...@@ -123,7 +123,7 @@ void MachineLevelUserCloudPolicyRegisterWatcher::OnPolicyRegisterFinished( ...@@ -123,7 +123,7 @@ void MachineLevelUserCloudPolicyRegisterWatcher::OnPolicyRegisterFinished(
} }
} }
void MachineLevelUserCloudPolicyRegisterWatcher::OnDialogClosed( void ChromeBrowserCloudManagementRegisterWatcher::OnDialogClosed(
bool is_accepted, bool is_accepted,
bool can_show_browser_window) { bool can_show_browser_window) {
if (can_show_browser_window) { if (can_show_browser_window) {
...@@ -157,7 +157,7 @@ void MachineLevelUserCloudPolicyRegisterWatcher::OnDialogClosed( ...@@ -157,7 +157,7 @@ void MachineLevelUserCloudPolicyRegisterWatcher::OnDialogClosed(
run_loop_.Quit(); run_loop_.Quit();
} }
void MachineLevelUserCloudPolicyRegisterWatcher::DisplayErrorMessage() { void ChromeBrowserCloudManagementRegisterWatcher::DisplayErrorMessage() {
dialog_->DisplayErrorMessage( dialog_->DisplayErrorMessage(
l10n_util::GetStringUTF16( l10n_util::GetStringUTF16(
IDS_ENTERPRISE_STARTUP_CLOUD_POLICY_ENROLLMENT_ERROR), 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
View file @ f0b27a22
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef 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_MACHINE_LEVEL_USER_CLOUD_POLICY_REGISTER_WATCHER_H_ #define CHROME_BROWSER_POLICY_CHROME_BROWSER_CLOUD_MANAGEMENT_REGISTER_WATCHER_H_
#include <memory> #include <memory>
#include <string> #include <string>
...@@ -17,24 +17,24 @@ ...@@ -17,24 +17,24 @@
#include "chrome/browser/policy/machine_level_user_cloud_policy_controller.h" #include "chrome/browser/policy/machine_level_user_cloud_policy_controller.h"
#include "chrome/browser/ui/enterprise_startup_dialog.h" #include "chrome/browser/ui/enterprise_startup_dialog.h"
class MachineLevelUserCloudPolicyRegisterWatcherTest; class ChromeBrowserCloudManagementRegisterWatcherTest;
namespace policy { 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. // Shows the blocking dialog for ongoing enrollment and failed enrollment.
class MachineLevelUserCloudPolicyRegisterWatcher class ChromeBrowserCloudManagementRegisterWatcher
: public MachineLevelUserCloudPolicyController::Observer { : public MachineLevelUserCloudPolicyController::Observer {
public: public:
using DialogCreationCallback = using DialogCreationCallback =
base::OnceCallback<std::unique_ptr<EnterpriseStartupDialog>( base::OnceCallback<std::unique_ptr<EnterpriseStartupDialog>(
EnterpriseStartupDialog::DialogResultCallback)>; EnterpriseStartupDialog::DialogResultCallback)>;
explicit MachineLevelUserCloudPolicyRegisterWatcher( explicit ChromeBrowserCloudManagementRegisterWatcher(
MachineLevelUserCloudPolicyController* controller); 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. // finishes. Returns the result of enrollment.
MachineLevelUserCloudPolicyController::RegisterResult MachineLevelUserCloudPolicyController::RegisterResult
WaitUntilCloudPolicyEnrollmentFinished(); WaitUntilCloudPolicyEnrollmentFinished();
...@@ -45,25 +45,25 @@ class MachineLevelUserCloudPolicyRegisterWatcher ...@@ -45,25 +45,25 @@ class MachineLevelUserCloudPolicyRegisterWatcher
void SetDialogCreationCallbackForTesting(DialogCreationCallback callback); void SetDialogCreationCallbackForTesting(DialogCreationCallback callback);
private: private:
FRIEND_TEST_ALL_PREFIXES(MachineLevelUserCloudPolicyRegisterWatcherTest, FRIEND_TEST_ALL_PREFIXES(ChromeBrowserCloudManagementRegisterWatcherTest,
EnrollmentSucceed); EnrollmentSucceed);
FRIEND_TEST_ALL_PREFIXES(MachineLevelUserCloudPolicyRegisterWatcherTest, FRIEND_TEST_ALL_PREFIXES(ChromeBrowserCloudManagementRegisterWatcherTest,
EnrollmentSucceedWithNoErrorMessageSetup); EnrollmentSucceedWithNoErrorMessageSetup);
FRIEND_TEST_ALL_PREFIXES(MachineLevelUserCloudPolicyRegisterWatcherTest, FRIEND_TEST_ALL_PREFIXES(ChromeBrowserCloudManagementRegisterWatcherTest,
EnrollmentFailedAndQuit); EnrollmentFailedAndQuit);
FRIEND_TEST_ALL_PREFIXES(MachineLevelUserCloudPolicyRegisterWatcherTest, FRIEND_TEST_ALL_PREFIXES(ChromeBrowserCloudManagementRegisterWatcherTest,
EnrollmentFailedAndRestart); EnrollmentFailedAndRestart);
FRIEND_TEST_ALL_PREFIXES(MachineLevelUserCloudPolicyRegisterWatcherTest, FRIEND_TEST_ALL_PREFIXES(ChromeBrowserCloudManagementRegisterWatcherTest,
EnrollmentCanceledBeforeFinish); EnrollmentCanceledBeforeFinish);
FRIEND_TEST_ALL_PREFIXES( FRIEND_TEST_ALL_PREFIXES(
MachineLevelUserCloudPolicyRegisterWatcherTest, ChromeBrowserCloudManagementRegisterWatcherTest,
EnrollmentCanceledBeforeFinishWithNoErrorMessageSetup); EnrollmentCanceledBeforeFinishWithNoErrorMessageSetup);
FRIEND_TEST_ALL_PREFIXES(MachineLevelUserCloudPolicyRegisterWatcherTest, FRIEND_TEST_ALL_PREFIXES(ChromeBrowserCloudManagementRegisterWatcherTest,
EnrollmentFailedBeforeDialogDisplay); EnrollmentFailedBeforeDialogDisplay);
FRIEND_TEST_ALL_PREFIXES(MachineLevelUserCloudPolicyRegisterWatcherTest, FRIEND_TEST_ALL_PREFIXES(ChromeBrowserCloudManagementRegisterWatcherTest,
EnrollmentFailedWithoutErrorMessage); EnrollmentFailedWithoutErrorMessage);
FRIEND_TEST_ALL_PREFIXES( FRIEND_TEST_ALL_PREFIXES(
MachineLevelUserCloudPolicyRegisterWatcherTest, ChromeBrowserCloudManagementRegisterWatcherTest,
EnrollmentFailedBeforeDialogDisplayWithoutErrorMessage); EnrollmentFailedBeforeDialogDisplayWithoutErrorMessage);
// Enum used with kStartupDialogHistogramName. // Enum used with kStartupDialogHistogramName.
...@@ -119,9 +119,9 @@ class MachineLevelUserCloudPolicyRegisterWatcher ...@@ -119,9 +119,9 @@ class MachineLevelUserCloudPolicyRegisterWatcher
base::Time visible_start_time_; base::Time visible_start_time_;
DISALLOW_COPY_AND_ASSIGN(MachineLevelUserCloudPolicyRegisterWatcher); DISALLOW_COPY_AND_ASSIGN(ChromeBrowserCloudManagementRegisterWatcher);
}; };
} // namespace policy } // 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_register_watcher_unittest.cc → chrome/browser/policy/chrome_browser_cloud_management_register_watcher_unittest.cc
View file @ f0b27a22
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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> #include <utility>
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
using ::testing::_;
using ::testing::InvokeWithoutArgs; using ::testing::InvokeWithoutArgs;
using ::testing::Return; using ::testing::Return;
using ::testing::_;
using RegisterResult = using RegisterResult =
policy::MachineLevelUserCloudPolicyController::RegisterResult; policy::MachineLevelUserCloudPolicyController::RegisterResult;
...@@ -83,9 +83,9 @@ class MockEnterpriseStartupDialog : public EnterpriseStartupDialog { ...@@ -83,9 +83,9 @@ class MockEnterpriseStartupDialog : public EnterpriseStartupDialog {
} // namespace } // namespace
class MachineLevelUserCloudPolicyRegisterWatcherTest : public ::testing::Test { class ChromeBrowserCloudManagementRegisterWatcherTest : public ::testing::Test {
public: public:
MachineLevelUserCloudPolicyRegisterWatcherTest() ChromeBrowserCloudManagementRegisterWatcherTest()
: watcher_(&controller_), : watcher_(&controller_),
dialog_(std::make_unique<MockEnterpriseStartupDialog>()), dialog_(std::make_unique<MockEnterpriseStartupDialog>()),
dialog_ptr_(dialog_.get()) { dialog_ptr_(dialog_.get()) {
...@@ -93,7 +93,7 @@ class MachineLevelUserCloudPolicyRegisterWatcherTest : public ::testing::Test { ...@@ -93,7 +93,7 @@ class MachineLevelUserCloudPolicyRegisterWatcherTest : public ::testing::Test {
storage_.SetDMToken(std::string()); storage_.SetDMToken(std::string());
storage_.SetClientId(kClientId); storage_.SetClientId(kClientId);
watcher_.SetDialogCreationCallbackForTesting( watcher_.SetDialogCreationCallbackForTesting(
base::BindOnce(&MachineLevelUserCloudPolicyRegisterWatcherTest:: base::BindOnce(&ChromeBrowserCloudManagementRegisterWatcherTest::
CreateEnterpriseStartupDialog, CreateEnterpriseStartupDialog,
base::Unretained(this))); base::Unretained(this)));
} }
...@@ -103,7 +103,7 @@ class MachineLevelUserCloudPolicyRegisterWatcherTest : public ::testing::Test { ...@@ -103,7 +103,7 @@ class MachineLevelUserCloudPolicyRegisterWatcherTest : public ::testing::Test {
FakeMachineLevelUserCloudPolicyController* controller() { FakeMachineLevelUserCloudPolicyController* controller() {
return &controller_; return &controller_;
} }
MachineLevelUserCloudPolicyRegisterWatcher* watcher() { return &watcher_; } ChromeBrowserCloudManagementRegisterWatcher* watcher() { return &watcher_; }
MockEnterpriseStartupDialog* dialog() { return dialog_ptr_; } MockEnterpriseStartupDialog* dialog() { return dialog_ptr_; }
std::unique_ptr<EnterpriseStartupDialog> CreateEnterpriseStartupDialog( std::unique_ptr<EnterpriseStartupDialog> CreateEnterpriseStartupDialog(
...@@ -116,22 +116,22 @@ class MachineLevelUserCloudPolicyRegisterWatcherTest : public ::testing::Test { ...@@ -116,22 +116,22 @@ class MachineLevelUserCloudPolicyRegisterWatcherTest : public ::testing::Test {
content::BrowserTaskEnvironment task_environment_; content::BrowserTaskEnvironment task_environment_;
FakeMachineLevelUserCloudPolicyController controller_; FakeMachineLevelUserCloudPolicyController controller_;
MachineLevelUserCloudPolicyRegisterWatcher watcher_; ChromeBrowserCloudManagementRegisterWatcher watcher_;
FakeBrowserDMTokenStorage storage_; FakeBrowserDMTokenStorage storage_;
std::unique_ptr<MockEnterpriseStartupDialog> dialog_; std::unique_ptr<MockEnterpriseStartupDialog> dialog_;
MockEnterpriseStartupDialog* dialog_ptr_; MockEnterpriseStartupDialog* dialog_ptr_;
DISALLOW_COPY_AND_ASSIGN(MachineLevelUserCloudPolicyRegisterWatcherTest); DISALLOW_COPY_AND_ASSIGN(ChromeBrowserCloudManagementRegisterWatcherTest);
}; };
TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, TEST_F(ChromeBrowserCloudManagementRegisterWatcherTest,
NoEnrollmentNeededWithDMToken) { NoEnrollmentNeededWithDMToken) {
storage()->SetDMToken(kDMToken); storage()->SetDMToken(kDMToken);
EXPECT_EQ(RegisterResult::kEnrollmentSuccessBeforeDialogDisplayed, EXPECT_EQ(RegisterResult::kEnrollmentSuccessBeforeDialogDisplayed,
watcher()->WaitUntilCloudPolicyEnrollmentFinished()); watcher()->WaitUntilCloudPolicyEnrollmentFinished());
} }
TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, TEST_F(ChromeBrowserCloudManagementRegisterWatcherTest,
NoEnrollmentNeededWithoutEnrollmentToken) { NoEnrollmentNeededWithoutEnrollmentToken) {
storage()->SetEnrollmentToken(std::string()); storage()->SetEnrollmentToken(std::string());
storage()->SetDMToken(std::string()); storage()->SetDMToken(std::string());
...@@ -139,7 +139,7 @@ TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, ...@@ -139,7 +139,7 @@ TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest,
watcher()->WaitUntilCloudPolicyEnrollmentFinished()); watcher()->WaitUntilCloudPolicyEnrollmentFinished());
} }
TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, EnrollmentSucceed) { TEST_F(ChromeBrowserCloudManagementRegisterWatcherTest, EnrollmentSucceed) {
base::HistogramTester histogram_tester; base::HistogramTester histogram_tester;
EXPECT_CALL(*dialog(), DisplayLaunchingInformationWithThrobber(_)); EXPECT_CALL(*dialog(), DisplayLaunchingInformationWithThrobber(_));
...@@ -152,18 +152,18 @@ TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, EnrollmentSucceed) { ...@@ -152,18 +152,18 @@ TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, EnrollmentSucceed) {
EXPECT_EQ(RegisterResult::kEnrollmentSuccess, EXPECT_EQ(RegisterResult::kEnrollmentSuccess,
watcher()->WaitUntilCloudPolicyEnrollmentFinished()); watcher()->WaitUntilCloudPolicyEnrollmentFinished());
histogram_tester.ExpectBucketCount( histogram_tester.ExpectBucketCount(
MachineLevelUserCloudPolicyRegisterWatcher::kStartupDialogHistogramName, ChromeBrowserCloudManagementRegisterWatcher::kStartupDialogHistogramName,
MachineLevelUserCloudPolicyRegisterWatcher::EnrollmentStartupDialog:: ChromeBrowserCloudManagementRegisterWatcher::EnrollmentStartupDialog::
kShown, kShown,
1); 1);
histogram_tester.ExpectBucketCount( histogram_tester.ExpectBucketCount(
MachineLevelUserCloudPolicyRegisterWatcher::kStartupDialogHistogramName, ChromeBrowserCloudManagementRegisterWatcher::kStartupDialogHistogramName,
MachineLevelUserCloudPolicyRegisterWatcher::EnrollmentStartupDialog:: ChromeBrowserCloudManagementRegisterWatcher::EnrollmentStartupDialog::
kClosedSuccess, kClosedSuccess,
1); 1);
} }
TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, TEST_F(ChromeBrowserCloudManagementRegisterWatcherTest,
EnrollmentSucceedWithNoErrorMessageSetup) { EnrollmentSucceedWithNoErrorMessageSetup) {
base::HistogramTester histogram_tester; base::HistogramTester histogram_tester;
...@@ -178,18 +178,18 @@ TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, ...@@ -178,18 +178,18 @@ TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest,
EXPECT_EQ(RegisterResult::kEnrollmentSuccess, EXPECT_EQ(RegisterResult::kEnrollmentSuccess,
watcher()->WaitUntilCloudPolicyEnrollmentFinished()); watcher()->WaitUntilCloudPolicyEnrollmentFinished());
histogram_tester.ExpectBucketCount( histogram_tester.ExpectBucketCount(
MachineLevelUserCloudPolicyRegisterWatcher::kStartupDialogHistogramName, ChromeBrowserCloudManagementRegisterWatcher::kStartupDialogHistogramName,
MachineLevelUserCloudPolicyRegisterWatcher::EnrollmentStartupDialog:: ChromeBrowserCloudManagementRegisterWatcher::EnrollmentStartupDialog::
kShown, kShown,
1); 1);
histogram_tester.ExpectBucketCount( histogram_tester.ExpectBucketCount(
MachineLevelUserCloudPolicyRegisterWatcher::kStartupDialogHistogramName, ChromeBrowserCloudManagementRegisterWatcher::kStartupDialogHistogramName,
MachineLevelUserCloudPolicyRegisterWatcher::EnrollmentStartupDialog:: ChromeBrowserCloudManagementRegisterWatcher::EnrollmentStartupDialog::
kClosedSuccess, kClosedSuccess,
1); 1);
} }
TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, TEST_F(ChromeBrowserCloudManagementRegisterWatcherTest,
EnrollmentFailedAndQuit) { EnrollmentFailedAndQuit) {
base::HistogramTester histogram_tester; base::HistogramTester histogram_tester;
...@@ -206,18 +206,18 @@ TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, ...@@ -206,18 +206,18 @@ TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest,
EXPECT_EQ(RegisterResult::kQuitDueToFailure, EXPECT_EQ(RegisterResult::kQuitDueToFailure,
watcher()->WaitUntilCloudPolicyEnrollmentFinished()); watcher()->WaitUntilCloudPolicyEnrollmentFinished());
histogram_tester.ExpectBucketCount( histogram_tester.ExpectBucketCount(
MachineLevelUserCloudPolicyRegisterWatcher::kStartupDialogHistogramName, ChromeBrowserCloudManagementRegisterWatcher::kStartupDialogHistogramName,
MachineLevelUserCloudPolicyRegisterWatcher::EnrollmentStartupDialog:: ChromeBrowserCloudManagementRegisterWatcher::EnrollmentStartupDialog::
kShown, kShown,
1); 1);
histogram_tester.ExpectBucketCount( histogram_tester.ExpectBucketCount(
MachineLevelUserCloudPolicyRegisterWatcher::kStartupDialogHistogramName, ChromeBrowserCloudManagementRegisterWatcher::kStartupDialogHistogramName,
MachineLevelUserCloudPolicyRegisterWatcher::EnrollmentStartupDialog:: ChromeBrowserCloudManagementRegisterWatcher::EnrollmentStartupDialog::
kClosedFail, kClosedFail,
1); 1);
} }
TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, TEST_F(ChromeBrowserCloudManagementRegisterWatcherTest,
EnrollmentFailedAndRestart) { EnrollmentFailedAndRestart) {
base::HistogramTester histogram_tester; base::HistogramTester histogram_tester;
...@@ -234,18 +234,18 @@ TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, ...@@ -234,18 +234,18 @@ TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest,
EXPECT_EQ(RegisterResult::kRestartDueToFailure, EXPECT_EQ(RegisterResult::kRestartDueToFailure,
watcher()->WaitUntilCloudPolicyEnrollmentFinished()); watcher()->WaitUntilCloudPolicyEnrollmentFinished());
histogram_tester.ExpectBucketCount( histogram_tester.ExpectBucketCount(
MachineLevelUserCloudPolicyRegisterWatcher::kStartupDialogHistogramName, ChromeBrowserCloudManagementRegisterWatcher::kStartupDialogHistogramName,
MachineLevelUserCloudPolicyRegisterWatcher::EnrollmentStartupDialog:: ChromeBrowserCloudManagementRegisterWatcher::EnrollmentStartupDialog::
kShown, kShown,
1); 1);
histogram_tester.ExpectBucketCount( histogram_tester.ExpectBucketCount(
MachineLevelUserCloudPolicyRegisterWatcher::kStartupDialogHistogramName, ChromeBrowserCloudManagementRegisterWatcher::kStartupDialogHistogramName,
MachineLevelUserCloudPolicyRegisterWatcher::EnrollmentStartupDialog:: ChromeBrowserCloudManagementRegisterWatcher::EnrollmentStartupDialog::
kClosedRelaunch, kClosedRelaunch,
1); 1);
} }
TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, TEST_F(ChromeBrowserCloudManagementRegisterWatcherTest,
EnrollmentCanceledBeforeFinish) { EnrollmentCanceledBeforeFinish) {
base::HistogramTester histogram_tester; base::HistogramTester histogram_tester;
...@@ -257,18 +257,18 @@ TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, ...@@ -257,18 +257,18 @@ TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest,
EXPECT_EQ(RegisterResult::kQuitDueToFailure, EXPECT_EQ(RegisterResult::kQuitDueToFailure,
watcher()->WaitUntilCloudPolicyEnrollmentFinished()); watcher()->WaitUntilCloudPolicyEnrollmentFinished());
histogram_tester.ExpectBucketCount( histogram_tester.ExpectBucketCount(
MachineLevelUserCloudPolicyRegisterWatcher::kStartupDialogHistogramName, ChromeBrowserCloudManagementRegisterWatcher::kStartupDialogHistogramName,
MachineLevelUserCloudPolicyRegisterWatcher::EnrollmentStartupDialog:: ChromeBrowserCloudManagementRegisterWatcher::EnrollmentStartupDialog::
kShown, kShown,
1); 1);
histogram_tester.ExpectBucketCount( histogram_tester.ExpectBucketCount(
MachineLevelUserCloudPolicyRegisterWatcher::kStartupDialogHistogramName, ChromeBrowserCloudManagementRegisterWatcher::kStartupDialogHistogramName,
MachineLevelUserCloudPolicyRegisterWatcher::EnrollmentStartupDialog:: ChromeBrowserCloudManagementRegisterWatcher::EnrollmentStartupDialog::
kClosedAbort, kClosedAbort,
1); 1);
} }
TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, TEST_F(ChromeBrowserCloudManagementRegisterWatcherTest,
EnrollmentCanceledBeforeFinishWithNoErrorMessageSetup) { EnrollmentCanceledBeforeFinishWithNoErrorMessageSetup) {
base::HistogramTester histogram_tester; base::HistogramTester histogram_tester;
...@@ -282,18 +282,18 @@ TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, ...@@ -282,18 +282,18 @@ TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest,
EXPECT_EQ(RegisterResult::kQuitDueToFailure, EXPECT_EQ(RegisterResult::kQuitDueToFailure,
watcher()->WaitUntilCloudPolicyEnrollmentFinished()); watcher()->WaitUntilCloudPolicyEnrollmentFinished());
histogram_tester.ExpectBucketCount( histogram_tester.ExpectBucketCount(
MachineLevelUserCloudPolicyRegisterWatcher::kStartupDialogHistogramName, ChromeBrowserCloudManagementRegisterWatcher::kStartupDialogHistogramName,
MachineLevelUserCloudPolicyRegisterWatcher::EnrollmentStartupDialog:: ChromeBrowserCloudManagementRegisterWatcher::EnrollmentStartupDialog::
kShown, kShown,
1); 1);
histogram_tester.ExpectBucketCount( histogram_tester.ExpectBucketCount(
MachineLevelUserCloudPolicyRegisterWatcher::kStartupDialogHistogramName, ChromeBrowserCloudManagementRegisterWatcher::kStartupDialogHistogramName,
MachineLevelUserCloudPolicyRegisterWatcher::EnrollmentStartupDialog:: ChromeBrowserCloudManagementRegisterWatcher::EnrollmentStartupDialog::
kClosedAbort, kClosedAbort,
1); 1);
} }
TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, TEST_F(ChromeBrowserCloudManagementRegisterWatcherTest,
EnrollmentFailedBeforeDialogDisplay) { EnrollmentFailedBeforeDialogDisplay) {
base::HistogramTester histogram_tester; base::HistogramTester histogram_tester;
...@@ -304,18 +304,18 @@ TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, ...@@ -304,18 +304,18 @@ TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest,
EXPECT_EQ(RegisterResult::kQuitDueToFailure, EXPECT_EQ(RegisterResult::kQuitDueToFailure,
watcher()->WaitUntilCloudPolicyEnrollmentFinished()); watcher()->WaitUntilCloudPolicyEnrollmentFinished());
histogram_tester.ExpectBucketCount( histogram_tester.ExpectBucketCount(
MachineLevelUserCloudPolicyRegisterWatcher::kStartupDialogHistogramName, ChromeBrowserCloudManagementRegisterWatcher::kStartupDialogHistogramName,
MachineLevelUserCloudPolicyRegisterWatcher::EnrollmentStartupDialog:: ChromeBrowserCloudManagementRegisterWatcher::EnrollmentStartupDialog::
kShown, kShown,
1); 1);
histogram_tester.ExpectBucketCount( histogram_tester.ExpectBucketCount(
MachineLevelUserCloudPolicyRegisterWatcher::kStartupDialogHistogramName, ChromeBrowserCloudManagementRegisterWatcher::kStartupDialogHistogramName,
MachineLevelUserCloudPolicyRegisterWatcher::EnrollmentStartupDialog:: ChromeBrowserCloudManagementRegisterWatcher::EnrollmentStartupDialog::
kClosedFail, kClosedFail,
1); 1);
} }
TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, TEST_F(ChromeBrowserCloudManagementRegisterWatcherTest,
EnrollmentFailedWithoutErrorMessage) { EnrollmentFailedWithoutErrorMessage) {
base::HistogramTester histogram_tester; base::HistogramTester histogram_tester;
...@@ -330,18 +330,18 @@ TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, ...@@ -330,18 +330,18 @@ TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest,
EXPECT_EQ(RegisterResult::kEnrollmentFailedSilently, EXPECT_EQ(RegisterResult::kEnrollmentFailedSilently,
watcher()->WaitUntilCloudPolicyEnrollmentFinished()); watcher()->WaitUntilCloudPolicyEnrollmentFinished());
histogram_tester.ExpectBucketCount( histogram_tester.ExpectBucketCount(
MachineLevelUserCloudPolicyRegisterWatcher::kStartupDialogHistogramName, ChromeBrowserCloudManagementRegisterWatcher::kStartupDialogHistogramName,
MachineLevelUserCloudPolicyRegisterWatcher::EnrollmentStartupDialog:: ChromeBrowserCloudManagementRegisterWatcher::EnrollmentStartupDialog::
kShown, kShown,
1); 1);
histogram_tester.ExpectBucketCount( histogram_tester.ExpectBucketCount(
MachineLevelUserCloudPolicyRegisterWatcher::kStartupDialogHistogramName, ChromeBrowserCloudManagementRegisterWatcher::kStartupDialogHistogramName,
MachineLevelUserCloudPolicyRegisterWatcher::EnrollmentStartupDialog:: ChromeBrowserCloudManagementRegisterWatcher::EnrollmentStartupDialog::
kClosedFailAndIgnore, kClosedFailAndIgnore,
1); 1);
} }
TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, TEST_F(ChromeBrowserCloudManagementRegisterWatcherTest,
EnrollmentFailedBeforeDialogDisplayWithoutErrorMessage) { EnrollmentFailedBeforeDialogDisplayWithoutErrorMessage) {
base::HistogramTester histogram_tester; base::HistogramTester histogram_tester;
...@@ -350,7 +350,7 @@ TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest, ...@@ -350,7 +350,7 @@ TEST_F(MachineLevelUserCloudPolicyRegisterWatcherTest,
EXPECT_EQ(RegisterResult::kEnrollmentFailedSilentlyBeforeDialogDisplayed, EXPECT_EQ(RegisterResult::kEnrollmentFailedSilentlyBeforeDialogDisplayed,
watcher()->WaitUntilCloudPolicyEnrollmentFinished()); watcher()->WaitUntilCloudPolicyEnrollmentFinished());
histogram_tester.ExpectTotalCount( histogram_tester.ExpectTotalCount(
MachineLevelUserCloudPolicyRegisterWatcher::kStartupDialogHistogramName, ChromeBrowserCloudManagementRegisterWatcher::kStartupDialogHistogramName,
0); 0);
} }
......
chrome/browser/policy/machine_level_user_cloud_policy_controller.cc
View file @ f0b27a22
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
#include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/net/system_network_context_manager.h" #include "chrome/browser/net/system_network_context_manager.h"
#include "chrome/browser/policy/browser_dm_token_storage.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/chrome_browser_policy_connector.h"
#include "chrome/browser/policy/cloud/chrome_browser_cloud_management_helper.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_features.h"
#include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_paths.h"
#include "components/policy/core/common/cloud/cloud_external_data_manager.h" #include "components/policy/core/common/cloud/cloud_external_data_manager.h"
...@@ -204,8 +204,8 @@ void MachineLevelUserCloudPolicyController::Init( ...@@ -204,8 +204,8 @@ void MachineLevelUserCloudPolicyController::Init(
url_loader_factory); url_loader_factory);
if (dm_token.empty()) { if (dm_token.empty()) {
policy_register_watcher_ = cloud_management_register_watcher_ =
std::make_unique<MachineLevelUserCloudPolicyRegisterWatcher>(this); std::make_unique<ChromeBrowserCloudManagementRegisterWatcher>(this);
enrollment_start_time_ = base::Time::Now(); enrollment_start_time_ = base::Time::Now();
...@@ -230,9 +230,9 @@ void MachineLevelUserCloudPolicyController::Init( ...@@ -230,9 +230,9 @@ void MachineLevelUserCloudPolicyController::Init(
bool MachineLevelUserCloudPolicyController:: bool MachineLevelUserCloudPolicyController::
WaitUntilPolicyEnrollmentFinished() { WaitUntilPolicyEnrollmentFinished() {
if (policy_register_watcher_) { if (cloud_management_register_watcher_) {
switch ( switch (cloud_management_register_watcher_
policy_register_watcher_->WaitUntilCloudPolicyEnrollmentFinished()) { ->WaitUntilCloudPolicyEnrollmentFinished()) {
case RegisterResult::kNoEnrollmentNeeded: case RegisterResult::kNoEnrollmentNeeded:
case RegisterResult::kEnrollmentSuccessBeforeDialogDisplayed: case RegisterResult::kEnrollmentSuccessBeforeDialogDisplayed:
case RegisterResult::kEnrollmentFailedSilentlyBeforeDialogDisplayed: case RegisterResult::kEnrollmentFailedSilentlyBeforeDialogDisplayed:
...@@ -263,8 +263,8 @@ void MachineLevelUserCloudPolicyController::RemoveObserver(Observer* observer) { ...@@ -263,8 +263,8 @@ void MachineLevelUserCloudPolicyController::RemoveObserver(Observer* observer) {
} }
bool MachineLevelUserCloudPolicyController::IsEnterpriseStartupDialogShowing() { bool MachineLevelUserCloudPolicyController::IsEnterpriseStartupDialogShowing() {
return policy_register_watcher_ && return cloud_management_register_watcher_ &&
policy_register_watcher_->IsDialogShowing(); cloud_management_register_watcher_->IsDialogShowing();
} }
void MachineLevelUserCloudPolicyController::NotifyPolicyRegisterFinished( void MachineLevelUserCloudPolicyController::NotifyPolicyRegisterFinished(
......
chrome/browser/policy/machine_level_user_cloud_policy_controller.h
View file @ f0b27a22
...@@ -29,7 +29,7 @@ class ChromeBrowserCloudManagementRegistrar; ...@@ -29,7 +29,7 @@ class ChromeBrowserCloudManagementRegistrar;
class ConfigurationPolicyProvider; class ConfigurationPolicyProvider;
class MachineLevelUserCloudPolicyManager; class MachineLevelUserCloudPolicyManager;
class MachineLevelUserCloudPolicyFetcher; class MachineLevelUserCloudPolicyFetcher;
class MachineLevelUserCloudPolicyRegisterWatcher; class ChromeBrowserCloudManagementRegisterWatcher;
// A class that setups and manages MachineLevelUserCloudPolicy. // A class that setups and manages MachineLevelUserCloudPolicy.
class MachineLevelUserCloudPolicyController { class MachineLevelUserCloudPolicyController {
...@@ -109,8 +109,8 @@ class MachineLevelUserCloudPolicyController { ...@@ -109,8 +109,8 @@ class MachineLevelUserCloudPolicyController {
std::unique_ptr<MachineLevelUserCloudPolicyFetcher> policy_fetcher_; std::unique_ptr<MachineLevelUserCloudPolicyFetcher> policy_fetcher_;
// This is an observer of the controller and needs to be declared after the // This is an observer of the controller and needs to be declared after the
// |observers_|. // |observers_|.
std::unique_ptr<MachineLevelUserCloudPolicyRegisterWatcher> std::unique_ptr<ChromeBrowserCloudManagementRegisterWatcher>
policy_register_watcher_; cloud_management_register_watcher_;
// Time at which the enrollment process was started. Used to log UMA metric. // Time at which the enrollment process was started. Used to log UMA metric.
base::Time enrollment_start_time_; base::Time enrollment_start_time_;
......
chrome/test/BUILD.gn
View file @ f0b27a22
...@@ -4964,7 +4964,7 @@ test("unit_tests") { ...@@ -4964,7 +4964,7 @@ test("unit_tests") {
sources += [ sources += [
"../browser/media/webrtc/native_desktop_media_list_unittest.cc", "../browser/media/webrtc/native_desktop_media_list_unittest.cc",
"../browser/metrics/upgrade_metrics_provider_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/profiles/profile_activity_metrics_recorder_unittest.cc",
"../browser/signin/force_signin_verifier_unittest.cc", "../browser/signin/force_signin_verifier_unittest.cc",
"../browser/signin/signin_global_error_unittest.cc", "../browser/signin/signin_global_error_unittest.cc",
......
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