Fix policy invalidator lifecycle bugs for Android.

chrome/browser/policy/cloud/user_cloud_policy_invalidator.cc

Index: chrome/browser/policy/cloud/user_cloud_policy_invalidator.cc
diff --git a/chrome/browser/policy/cloud/user_cloud_policy_invalidator.cc b/chrome/browser/policy/cloud/user_cloud_policy_invalidator.cc
index 26e001a4f7ea65fadc12c0716d30186fe7a85c07..ae4edc61b5a90a6f35f6152cddcc69ace6b13324 100644
--- a/chrome/browser/policy/cloud/user_cloud_policy_invalidator.cc
+++ b/chrome/browser/policy/cloud/user_cloud_policy_invalidator.cc
@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/invalidation/invalidation_service_factory.h"
 #include "chrome/browser/policy/cloud/cloud_policy_core.h"
 #include "chrome/browser/policy/cloud/cloud_policy_manager.h"
 #include "content/public/browser/notification_source.h"
@@ -17,20 +18,29 @@ UserCloudPolicyInvalidator::UserCloudPolicyInvalidator(
     Profile* profile,
     CloudPolicyManager* policy_manager)
     : CloudPolicyInvalidator(
+          base::Bind(
+              &invalidation::InvalidationServiceFactory::GetForProfile,
+              base::Unretained(profile)),
           policy_manager,
           policy_manager->core()->store(),
           base::MessageLoopProxy::current()),
-      profile_(profile),
-      policy_manager_(policy_manager) {
+      policy_manager_(policy_manager),
+      weak_factory_(this) {
   DCHECK(profile);
 
-  // Register for notification that profile creation is complete.
+  // Register for notification that profile creation is complete. The
+  // invalidator must not be started before then because the invalidation
+  // service cannot be started because it depends on components initialized
+  // after this object is instantiated.
   registrar_.Add(this,
                  chrome::NOTIFICATION_PROFILE_ADDED,
                  content::Source<Profile>(profile));
 }
 
+UserCloudPolicyInvalidator::~UserCloudPolicyInvalidator() {}
+
 void UserCloudPolicyInvalidator::Shutdown() {
+  weak_factory_.InvalidateWeakPtrs();
   CloudPolicyInvalidator::Shutdown();
 }
 
@@ -38,13 +48,10 @@ void UserCloudPolicyInvalidator::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  // Enable invalidations now that profile creation is complete.
   DCHECK(type == chrome::NOTIFICATION_PROFILE_ADDED);
-  policy_manager_->EnableInvalidations(
-      base::Bind(
-          &CloudPolicyInvalidator::InitializeWithProfile,
-          GetWeakPtr(),
-          base::Unretained(profile_)));
+  // Pass a reference to the invalidator to the policy manager, which handles
+  // starting and stopping the invalidator.
+  policy_manager_->SetInvalidator(weak_factory_.GetWeakPtr());
 }
 
 }  // namespace policy