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

chrome/browser/chromeos/policy/consumer_enrollment_handler_factory.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/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/consumer_enrollment_handler.h"
@@ skipping 24 matching lines @@
     : BrowserContextKeyedServiceFactory(
           "ConsumerEnrollmentHandler",
           BrowserContextDependencyManager::GetInstance()) {
   DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance());
   DependsOn(SigninManagerFactory::GetInstance());
 }
 
 ConsumerEnrollmentHandlerFactory::~ConsumerEnrollmentHandlerFactory() {
 }
 
-bool ConsumerEnrollmentHandlerFactory::ShouldCreateHandler(
-    Profile* profile,
-    ConsumerManagementService* service) const {
-  if (!service)
-    return false;
-
-  // On a fresh device, the first time the owner signs in, IsOwnerProfile()
-  // will return false. But it is okay since there's no enrollment in progress
-  // so we don't need to create a handler.
-  if (!chromeos::ProfileHelper::IsOwnerProfile(profile))
-    return false;
-
-  return service->GetStatus() == ConsumerManagementService::STATUS_ENROLLING ||
-      service->HasPendingEnrollmentNotification();
-}
-
 KeyedService* ConsumerEnrollmentHandlerFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
+  // On a fresh device, the first time the owner signs in, IsOwnerProfile()
+  // will return false. But it is okay since there's no enrollment in progress.
   Profile* profile = Profile::FromBrowserContext(context);
+  if (!chromeos::ProfileHelper::IsOwnerProfile(profile))
+    return nullptr;
+
   BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   ConsumerManagementService* service =
       connector->GetConsumerManagementService();
+  if (!service)
+    return nullptr;
 
-  if (ShouldCreateHandler(profile, service)) {
-    return new ConsumerEnrollmentHandler(
-        profile,
-        service,
-        connector->GetDeviceManagementServiceForConsumer());
-  } else {
+  if (service->GetStatus() != ConsumerManagementService::STATUS_ENROLLING)

[Mattias Nissler (ping if slow), 2014/11/18 10:02:26]

nit: could merge this conditional with the one in line 57.

[davidyu, 2014/11/19 02:54:21]

Done.

     return nullptr;
-  }
+
+  return new ConsumerEnrollmentHandler(
+      profile,
+      service,
+      connector->GetDeviceManagementServiceForConsumer());
 }
 
 bool ConsumerEnrollmentHandlerFactory::ServiceIsCreatedWithBrowserContext()
     const {
   return true;
 }
 
 }  // namespace policy