| Index: chrome/browser/chromeos/policy/consumer_management_notifier_unittest.cc
|
| diff --git a/chrome/browser/chromeos/policy/consumer_management_notifier_unittest.cc b/chrome/browser/chromeos/policy/consumer_management_notifier_unittest.cc
|
| index 26c1d46ab2478c3194bb2e27a99452464b361eb4..9d709a38aa7d8e62fed9673cfbcd886f4de6682a 100644
|
| --- a/chrome/browser/chromeos/policy/consumer_management_notifier_unittest.cc
|
| +++ b/chrome/browser/chromeos/policy/consumer_management_notifier_unittest.cc
|
| @@ -64,49 +64,24 @@
|
| NotificationUIManager::GetProfileID(profile()));
|
| }
|
|
|
| - bool HasUnenrollmentNotification() {
|
| - return g_browser_process->notification_ui_manager()->FindById(
|
| - "consumer_management.unenroll",
|
| - NotificationUIManager::GetProfileID(profile()));
|
| - }
|
| -
|
| FakeConsumerManagementService* fake_service_;
|
| scoped_ptr<TestingProfileManager> testing_profile_manager_;
|
| scoped_ptr<ConsumerManagementNotifier> notification_;
|
| };
|
|
|
| -TEST_F(ConsumerManagementNotifierTest,
|
| - ShowsEnrollmentNotificationWhenCreated) {
|
| +TEST_F(ConsumerManagementNotifierTest, ShowsNotificationWhenCreated) {
|
| fake_service_->SetStatusAndStage(
|
| ConsumerManagementService::STATUS_UNENROLLED,
|
| ConsumerManagementStage::EnrollmentCanceled());
|
| EXPECT_FALSE(HasEnrollmentNotification());
|
| - EXPECT_FALSE(HasUnenrollmentNotification());
|
|
|
| CreateConsumerManagementNotifier();
|
|
|
| EXPECT_EQ(ConsumerManagementStage::None(), fake_service_->GetStage());
|
| EXPECT_TRUE(HasEnrollmentNotification());
|
| - EXPECT_FALSE(HasUnenrollmentNotification());
|
| }
|
|
|
| -TEST_F(ConsumerManagementNotifierTest,
|
| - ShowsUnenrollmentNotificationWhenCreated) {
|
| - fake_service_->SetStatusAndStage(
|
| - ConsumerManagementService::STATUS_UNENROLLED,
|
| - ConsumerManagementStage::UnenrollmentSuccess());
|
| - EXPECT_FALSE(HasEnrollmentNotification());
|
| - EXPECT_FALSE(HasUnenrollmentNotification());
|
| -
|
| - CreateConsumerManagementNotifier();
|
| -
|
| - EXPECT_EQ(ConsumerManagementStage::None(), fake_service_->GetStage());
|
| - EXPECT_FALSE(HasEnrollmentNotification());
|
| - EXPECT_TRUE(HasUnenrollmentNotification());
|
| -}
|
| -
|
| -TEST_F(ConsumerManagementNotifierTest,
|
| - ShowsEnrollmentNotificationWhenStatusChanged) {
|
| +TEST_F(ConsumerManagementNotifierTest, ShowsNotificationWhenStatusChanged) {
|
| fake_service_->SetStatusAndStage(
|
| ConsumerManagementService::STATUS_ENROLLING,
|
| ConsumerManagementStage::EnrollmentOwnerStored());
|
| @@ -115,38 +90,12 @@
|
| EXPECT_EQ(ConsumerManagementStage::EnrollmentOwnerStored(),
|
| fake_service_->GetStage());
|
| EXPECT_FALSE(HasEnrollmentNotification());
|
| - EXPECT_FALSE(HasUnenrollmentNotification());
|
|
|
| fake_service_->SetStatusAndStage(
|
| ConsumerManagementService::STATUS_ENROLLED,
|
| ConsumerManagementStage::EnrollmentSuccess());
|
| EXPECT_EQ(ConsumerManagementStage::None(), fake_service_->GetStage());
|
| EXPECT_TRUE(HasEnrollmentNotification());
|
| - EXPECT_FALSE(HasUnenrollmentNotification());
|
| -}
|
| -
|
| -TEST_F(ConsumerManagementNotifierTest,
|
| - ShowsUnenrollmentNotificationWhenStatusChanged) {
|
| - fake_service_->SetStatusAndStage(
|
| - ConsumerManagementService::STATUS_ENROLLED,
|
| - ConsumerManagementStage::None());
|
| -
|
| - CreateConsumerManagementNotifier();
|
| - EXPECT_FALSE(HasEnrollmentNotification());
|
| - EXPECT_FALSE(HasUnenrollmentNotification());
|
| -
|
| - fake_service_->SetStatusAndStage(
|
| - ConsumerManagementService::STATUS_UNENROLLING,
|
| - ConsumerManagementStage::UnenrollmentRequested());
|
| - EXPECT_FALSE(HasEnrollmentNotification());
|
| - EXPECT_FALSE(HasUnenrollmentNotification());
|
| -
|
| - fake_service_->SetStatusAndStage(
|
| - ConsumerManagementService::STATUS_UNENROLLED,
|
| - ConsumerManagementStage::UnenrollmentSuccess());
|
| - EXPECT_EQ(ConsumerManagementStage::None(), fake_service_->GetStage());
|
| - EXPECT_FALSE(HasEnrollmentNotification());
|
| - EXPECT_TRUE(HasUnenrollmentNotification());
|
| }
|
|
|
| } // namespace policy
|
|
|