Move the notification part out of ConsumerEnrollmentHandler so that it can be reused for unenrollme…

chrome/browser/chromeos/policy/consumer_management_notifier_factory_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/policy/consumer_enrollment_handler_factory.h"
+#include "chrome/browser/chromeos/policy/consumer_management_notifier_factory.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/login/users/fake_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
+#include "chrome/browser/chromeos/policy/consumer_management_notifier.h"

[bartfab (slow), 2014/11/27 14:09:09]

Nit: Where is this used?

[davidyu, 2014/11/28 02:45:26]

It was used in a piece of testing code that didn't get into this CL at the end.
Removed.

 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
 #include "chrome/browser/chromeos/policy/fake_consumer_management_service.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 const char* kTestOwner = "test.owner@chromium.org.test";
 const char* kTestUser = "test.user@chromium.org.test";
 }
 
 namespace policy {
 
-class ConsumerEnrollmentHandlerFactoryTest : public testing::Test {
+class ConsumerManagementNotifierFactoryTest : public testing::Test {
  public:
-  ConsumerEnrollmentHandlerFactoryTest()
+  ConsumerManagementNotifierFactoryTest()
       : fake_service_(new FakeConsumerManagementService()),
         fake_user_manager_(new chromeos::FakeUserManager()),
         scoped_user_manager_enabler_(fake_user_manager_),
         testing_profile_manager_(new TestingProfileManager(
             TestingBrowserProcess::GetGlobal())) {
     // Set up FakeConsumerManagementService.
-    fake_service_->set_status(ConsumerManagementService::STATUS_ENROLLING);
-    fake_service_->SetEnrollmentStage(
-        ConsumerManagementService::ENROLLMENT_STAGE_OWNER_STORED);
+    fake_service_->SetStatusAndEnrollmentStage(
+        ConsumerManagementService::STATUS_UNENROLLED,
+        ConsumerManagementService::ENROLLMENT_STAGE_NONE);
 
     // Inject fake objects.
     BrowserPolicyConnectorChromeOS* connector =
         g_browser_process->platform_part()->browser_policy_connector_chromeos();
     connector->SetConsumerManagementServiceForTesting(
         make_scoped_ptr(fake_service_));
 
     // Set up FakeUserManager.
     fake_user_manager_->AddUser(kTestOwner);
     fake_user_manager_->AddUser(kTestUser);
     fake_user_manager_->set_owner_email(kTestOwner);
   }
 
   virtual void SetUp() override {
     ASSERT_TRUE(testing_profile_manager_->SetUp());
   }
 
   FakeConsumerManagementService* fake_service_;
   chromeos::FakeUserManager* fake_user_manager_;
   chromeos::ScopedUserManagerEnabler scoped_user_manager_enabler_;
   scoped_ptr<TestingProfileManager> testing_profile_manager_;
 };
 
-TEST_F(ConsumerEnrollmentHandlerFactoryTest, ServiceIsCreated) {
+TEST_F(ConsumerManagementNotifierFactoryTest, ServiceIsCreated) {
   Profile* profile = testing_profile_manager_->CreateTestingProfile(kTestOwner);
-  EXPECT_TRUE(ConsumerEnrollmentHandlerFactory::GetForBrowserContext(profile));
+  EXPECT_TRUE(
+      ConsumerManagementNotifierFactory::GetForBrowserContext(profile));
 }
 
-TEST_F(ConsumerEnrollmentHandlerFactoryTest, ServiceIsNotCreatedForNonOwner) {
+TEST_F(ConsumerManagementNotifierFactoryTest,
+       ServiceIsNotCreatedForNonOwner) {
   Profile* profile = testing_profile_manager_->CreateTestingProfile(kTestUser);
-  EXPECT_FALSE(ConsumerEnrollmentHandlerFactory::GetForBrowserContext(profile));
-}
-
-TEST_F(ConsumerEnrollmentHandlerFactoryTest,
-       ServiceIsNotCreatedIfItHasNothingToDo) {
-  fake_service_->set_status(ConsumerManagementService::STATUS_UNENROLLED);
-  fake_service_->SetEnrollmentStage(
-      ConsumerManagementService::ENROLLMENT_STAGE_NONE);
-
-  Profile* profile = testing_profile_manager_->CreateTestingProfile(kTestOwner);
-  EXPECT_FALSE(ConsumerEnrollmentHandlerFactory::GetForBrowserContext(profile));
+  EXPECT_FALSE(
+      ConsumerManagementNotifierFactory::GetForBrowserContext(profile));
 }
 
 }  // namespace policy