Implement cloud policy invalidations using the invalidation service framework.

chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.cc

Index: chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.cc
diff --git a/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.cc b/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.cc
new file mode 100644
index 0000000000000000000000000000000000000000..7fcfd18cf53feee96cc8d91d53ab54ecdfb52003
--- /dev/null
+++ b/chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.cc
@@ -0,0 +1,80 @@
+// Copyright (c) 2013 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/policy/cloud/user_cloud_policy_invalidator_factory.h"
+
+#include "base/command_line.h"
+#if defined(OS_CHROMEOS)

[Joao da Silva, 2013/07/25 18:03:53]

Put OS_CHROMEOS #includes after the unconditional #includes

[Steve Condie, 2013/07/26 01:39:25]

Done.

+#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
+#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
+#endif
+#include "chrome/browser/invalidation/invalidation_service_factory.h"
+#include "chrome/browser/policy/cloud/user_cloud_policy_invalidator.h"
+#if !defined(OS_CHROMEOS)

[Joao da Silva, 2013/07/25 18:03:53]

Same for these

[Steve Condie, 2013/07/26 01:39:25]

Done.

+#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
+#include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
+#endif
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_switches.h"
+#include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
+
+namespace policy {
+
+namespace {
+#if defined(OS_CHROMEOS)
+typedef UserCloudPolicyManagerFactoryChromeOS CloudPolicyManagerFactory;
+#else
+typedef UserCloudPolicyManagerFactory CloudPolicyManagerFactory;
+#endif
+}  // namespace

[Joao da Silva, 2013/07/25 18:03:53]

no need for the namespace for typedefs.

Also, it's clearer to have the #ifdef on lines 43 and 62, even if that seems
like a bit of duplication.

[Steve Condie, 2013/07/26 01:39:25]

Done.

+
+// static
+UserCloudPolicyInvalidatorFactory*
+    UserCloudPolicyInvalidatorFactory::GetInstance() {
+  return Singleton<UserCloudPolicyInvalidatorFactory>::get();
+}
+
+UserCloudPolicyInvalidatorFactory::UserCloudPolicyInvalidatorFactory()
+    : BrowserContextKeyedServiceFactory(
+          "UserCloudPolicyInvalidator",
+          BrowserContextDependencyManager::GetInstance()) {
+  DependsOn(invalidation::InvalidationServiceFactory::GetInstance());
+  DependsOn(CloudPolicyManagerFactory::GetInstance());
+}
+
+UserCloudPolicyInvalidatorFactory::~UserCloudPolicyInvalidatorFactory() {}
+
+BrowserContextKeyedService*
+    UserCloudPolicyInvalidatorFactory::BuildServiceInstanceFor(
+        content::BrowserContext* context) const {
+#if !defined(ANDROID_OS) // Allow invalidations on Android regardless of switch.
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableCloudPolicyPush)) {
+    return NULL;
+  }
+#endif

[Joao da Silva, 2013/07/25 18:03:53]

After discussing this with Mattias we decided it's not a good idea; Android
should respect the flag as well, and have this disabled by default.

We'll enable it after the branch point, and if it proves stable then we might
enable it again in beta.

[Steve Condie, 2013/07/26 01:39:25]

Done.

+
+  Profile* profile = static_cast<Profile*>(context);
+  invalidation::InvalidationService* invalidation_service =
+      invalidation::InvalidationServiceFactory::GetForProfile(profile);

[rlarocque, 2013/07/25 19:23:40]

I'm just catching up on the discussions of service lifetime.

Does this mean that we'll be instantiating an InvalidationService before the
PrefService?  I wouldn't expect that to work.  The InvalidationService depends
on the PrefService.

[Steve Condie, 2013/07/26 01:39:25]

This will be solved by not attempting to get the InvalidationService until the
NOTIFICATION_PROFILE_ADDED notification is sent by the profile (See latest
version of UserCloudPolicyInvalidator). Since that notification is sent at the
very end of profile initialization I assume it should be safe at that point.

+  CloudPolicyManager* policy_manager =
+      CloudPolicyManagerFactory::GetForProfile(profile);
+  if (!invalidation_service || !policy_manager)
+    return NULL;
+
+  return new UserCloudPolicyInvalidator(invalidation_service, policy_manager);
+}
+
+bool UserCloudPolicyInvalidatorFactory::
+ServiceIsCreatedWithBrowserContext() const {
+  // Must be automatically created to enable user policy invalidations.
+  return true;
+}
+
+bool UserCloudPolicyInvalidatorFactory::ServiceIsNULLWhileTesting() const {
+  // Not used in tests.
+  return true;
+}
+
+}  // namespace policy