Switch DeviceCloudPolicyInvalidator to shared InvalidationService

The DeviceCloudPolicyInvalidator used to ensure that a suitable
InvalidationService is available on its own. This CL makes it a consumer
of AffiliatedInvalidationServiceProvider, which manages an
InvalidationService that can be shared by DeviceCloudPolicyInvalidator
and other consumers.

BUG=442800
TEST=Updated unit tests

Review URL: https://codereview.chromium.org/846453006

Cr-Commit-Position: refs/heads/master@{#313562}

chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc

@@ -192,7 +192,8 @@ void BrowserPolicyConnectorChromeOS::Init(
               content::BrowserThread::IO),
           request_context));
   device_local_account_policy_service_->Connect(device_management_service());
-  device_cloud_policy_invalidator_.reset(new DeviceCloudPolicyInvalidator);
+  device_cloud_policy_invalidator_.reset(new DeviceCloudPolicyInvalidator(
+      affiliated_invalidation_service_provider_.get()));
 
   SetTimezoneIfPolicyAvailable();
 
@@ -212,18 +213,9 @@ void BrowserPolicyConnectorChromeOS::PreShutdown() {
   // the DeviceOAuth2TokenService that is destroyed before Shutdown() is called.
   if (affiliated_invalidation_service_provider_)
     affiliated_invalidation_service_provider_->Shutdown();
-
-  // Let the |device_cloud_policy_invalidator_| unregister itself as an
-  // observer of per-Profile InvalidationServices and the device-global
-  // invalidation::TiclInvalidationService it may have created as an observer of
-  // the DeviceOAuth2TokenService that is destroyed before Shutdown() is called.
-  device_cloud_policy_invalidator_.reset();
 }
 
 void BrowserPolicyConnectorChromeOS::Shutdown() {
-  // Verify that PreShutdown() has been called first.
-  DCHECK(!device_cloud_policy_invalidator_);
-
   network_configuration_updater_.reset();
 
   if (device_local_account_policy_service_)

chrome/browser/chromeos/policy/device_cloud_policy_invalidator.h

@@ -6,61 +6,38 @@
 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_CLOUD_POLICY_INVALIDATOR_H_
 
 #include "base/basictypes.h"
-#include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_vector.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
+#include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provider.h"
 
 namespace invalidation {
 class InvalidationService;
-class TiclInvalidationService;
 }
 
 namespace policy {
 
 class CloudPolicyInvalidator;
 
-// This class provides invalidations for device policy via a
-// |CloudPolicyInvalidator| backed by an |InvalidationService|. If an affiliated
-// user with a connected invalidation service is logged in, that service is used
-// to conserve server resources. If there are no logged-in users matching these
-// criteria, a device-global |TiclInvalidationService| is spun up.
-// The class monitors the status of the invalidation services and switches
-// between them whenever the service currently in use disconnects or the
-// device-global invalidation service can be replaced with another service that
-// just connected.
-class DeviceCloudPolicyInvalidator : public content::NotificationObserver {
+// This class manages the lifetime of a device-global |CloudPolicyInvalidator|
+// that handles device policy invalidations. It relies on an
+// |AffiliatedInvalidationServiceProvider| to provide it with access to a shared
+// |InvalidationService| to back the |CloudPolicyInvalidator|. Whenever the
+// shared |InvalidationService| changes, the |CloudPolicyInvalidator| destroyed
+// and re-created.
+class DeviceCloudPolicyInvalidator
+    : public AffiliatedInvalidationServiceProvider::Consumer {
  public:
-  DeviceCloudPolicyInvalidator();
+  explicit DeviceCloudPolicyInvalidator(
+      AffiliatedInvalidationServiceProvider* invalidation_service_provider);
   ~DeviceCloudPolicyInvalidator() override;
 
-  // content::NotificationObserver:
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
+  // AffiliatedInvalidationServiceProvider::Consumer:
+  void OnInvalidationServiceSet(
+      invalidation::InvalidationService* invalidation_service) override;
 
- private:
-  friend class DeviceCloudPolicyInvalidatorTest;
-
-  // Helper that monitors the status of a single |InvalidationService|.
-  class InvalidationServiceObserver;
-
-  // Status updates received from |InvalidationServiceObserver|s.
-  void OnInvalidationServiceConnected(
-      invalidation::InvalidationService* invalidation_service);
-  void OnInvalidationServiceDisconnected(
-      invalidation::InvalidationService* invalidation_service);
-
-  // Attempt to create a |CloudPolicyInvalidator| backed by a connected
-  // invalidation service. If no connected invalidation service is available for
-  // use, a |CloudPolicyInvalidator| will be created later when a connected
-  // service becomes available.
-  // Further ensures that a device-global invalidation service is running iff
-  // there is no other connected service available for use.
-  void TryToCreateInvalidator();
+  CloudPolicyInvalidator* GetInvalidatorForTest() const;
 
+ private:
   // Create a |CloudPolicyInvalidator| backed by the |invalidation_service|.
   void CreateInvalidator(
       invalidation::InvalidationService* invalidation_service);
@@ -68,30 +45,12 @@ class DeviceCloudPolicyInvalidator : public content::NotificationObserver {
   // Destroy the current |CloudPolicyInvalidator|, if any.
   void DestroyInvalidator();
 
-  // Destroy the device-global invalidation service, if any.
-  void DestroyDeviceInvalidationService();
-
-  content::NotificationRegistrar registrar_;
-
-  // Device-global invalidation service.
-  scoped_ptr<invalidation::TiclInvalidationService>
-      device_invalidation_service_;
-
-  // State observer for the device-global invalidation service.
-  scoped_ptr<InvalidationServiceObserver> device_invalidation_service_observer_;
-
-  // State observers for logged-in users' invalidation services.
-  ScopedVector<InvalidationServiceObserver>
-      profile_invalidation_service_observers_;
-
-  // The invalidation service backing the current |CloudPolicyInvalidator|. NULL
-  // if no |CloudPolicyInvalidator| exists.
-  invalidation::InvalidationService* invalidation_service_;
+  AffiliatedInvalidationServiceProvider* invalidation_service_provider_;
 
   // The highest invalidation version that was handled already.
   int64 highest_handled_invalidation_version_;
 
-  // The current |CloudPolicyInvalidator|. NULL if no connected invalidation
+  // The current |CloudPolicyInvalidator|. nullptr if no connected invalidation
   // service is available.
   scoped_ptr<CloudPolicyInvalidator> invalidator_;
 

chrome/browser/policy/cloud/cloud_policy_invalidator.h

@@ -94,6 +94,10 @@ class CloudPolicyInvalidator : public syncer::InvalidationHandler,
     return highest_handled_invalidation_version_;
   }
 
+  invalidation::InvalidationService* invalidation_service_for_test() const {
+    return invalidation_service_;
+  }
+
   // syncer::InvalidationHandler:
   void OnInvalidatorStateChange(syncer::InvalidatorState state) override;
   void OnIncomingInvalidation(