Fix policy invalidator lifecycle bugs for Android.

chrome/browser/policy/cloud/cloud_policy_manager.cc

 // Copyright (c) 2012 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/cloud_policy_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/policy/cloud/cloud_policy_refresh_scheduler.h"
 #include "chrome/browser/policy/cloud/cloud_policy_service.h"
 #include "chrome/browser/policy/policy_bundle.h"
 #include "chrome/browser/policy/policy_map.h"
 
 namespace policy {
 
 CloudPolicyManager::CloudPolicyManager(const PolicyNamespaceKey& policy_ns_key,
                                        CloudPolicyStore* cloud_policy_store)
     : core_(policy_ns_key, cloud_policy_store),
-      waiting_for_policy_refresh_(false) {
+      waiting_for_policy_refresh_(false),
+      invalidator_started_(false) {
   store()->AddObserver(this);
 
   // If the underlying store is already initialized, publish the loaded
   // policy. Otherwise, request a load now.
   if (store()->is_initialized())
     CheckAndPublishPolicy();
   else
     store()->Load();
 }
 
 CloudPolicyManager::~CloudPolicyManager() {}
 
-void CloudPolicyManager::EnableInvalidations(
-    const base::Closure& initialize_invalidator) {
-  DCHECK(!initialize_invalidator.is_null());
-  DCHECK(initialize_invalidator_.is_null());
-  // If the refresh scheduler is already running, initialize the invalidator
-  // right away. Otherwise, store the closure so it can be invoked when the
-  // refresh scheduler starts.
-  if (core()->refresh_scheduler())
-    initialize_invalidator.Run();
-  else
-    initialize_invalidator_ = initialize_invalidator;
+void CloudPolicyManager::SetInvalidator(
+    const base::WeakPtr<CloudPolicyInvalidator>& invalidator) {
+  DCHECK(invalidator);
+  invalidator_ = invalidator;
+  // Start the invalidator if StartInvalidator was already called.
+  if (invalidator_started_)
+    invalidator_->Start();
 }
 
 void CloudPolicyManager::Shutdown() {
   core_.Disconnect();
   store()->RemoveObserver(this);
   ConfigurationPolicyProvider::Shutdown();
 }
 
 bool CloudPolicyManager::IsInitializationComplete(PolicyDomain domain) const {
   if (domain == POLICY_DOMAIN_CHROME)
@@ skipping 43 matching lines @@
       invalidations_enabled);
 }
 
 void CloudPolicyManager::CheckAndPublishPolicy() {
   if (IsInitializationComplete(POLICY_DOMAIN_CHROME) &&
       !waiting_for_policy_refresh_) {
     UpdatePolicy(CreatePolicyBundle());
   }
 }
 
-void CloudPolicyManager::StartRefreshScheduler() {
-  DCHECK(!core()->refresh_scheduler());
-  core()->StartRefreshScheduler();
-  // Initialize the invalidator if EnableInvalidations has been called.
-  if (!initialize_invalidator_.is_null())
-    initialize_invalidator_.Run();
+void CloudPolicyManager::StartInvalidator() {
+  DCHECK(core()->refresh_scheduler());
+  invalidator_started_ = true;
+  CloudPolicyInvalidator* invalidator = invalidator_.get();
+  if (invalidator)
+    invalidator->Start();
+}
+
+void CloudPolicyManager::StopInvalidator() {
+  if (invalidator_started_) {
+    DCHECK(core()->refresh_scheduler());
+    invalidator_started_ = false;
+    CloudPolicyInvalidator* invalidator = invalidator_.get();
+    if (invalidator)
+      invalidator->Stop();
+  }
 }
 
 scoped_ptr<PolicyBundle> CloudPolicyManager::CreatePolicyBundle() {
   scoped_ptr<PolicyBundle> bundle(new PolicyBundle);
   bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
       .CopyFrom(store()->policy_map());
   return bundle.Pass();
 }
 
 void CloudPolicyManager::OnRefreshComplete(bool success) {
   waiting_for_policy_refresh_ = false;
   CheckAndPublishPolicy();
 }
 
 }  // namespace policy