Notify GCMAppHandlers when the store is reset, so they clear cached IDs

chrome/browser/chromeos/policy/heartbeat_scheduler_unittest.cc

 // Copyright (c) 2015 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/heartbeat_scheduler.h"
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 82 matching lines @@
     ASSERT_TRUE(observer_);
     observer_->OnConnected(net::IPEndPoint());
   }
 
   void IgnoreDefaultHeartbeatsInterval() {
     // Ignore default setting for heartbeats interval.
     EXPECT_CALL(*this, AddHeartbeatInterval(_, 2 * 60 * 1000))
         .Times(AnyNumber());
   }
 
+  void ResetStore() {
+    // Defensive copy in case OnStoreReset calls Add/RemoveAppHandler.
+    std::vector<gcm::GCMAppHandler*> app_handler_values;
+    for (const auto& key_value : app_handlers())
+      app_handler_values.push_back(key_value.second);
+    for (gcm::GCMAppHandler* app_handler : app_handler_values) {
+      app_handler->OnStoreReset();
+      // app_handler might now have been deleted.
+    }
+  }
+
  private:
   gcm::GCMConnectionObserver* observer_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(MockGCMDriver);
 };
 
 class HeartbeatSchedulerTest : public testing::Test {
  public:
   HeartbeatSchedulerTest()
       : task_runner_(new base::TestSimpleTaskRunner()),
@@ skipping 90 matching lines @@
   IgnoreUpstreamNotificationMsg();
   gcm_driver_.IgnoreDefaultHeartbeatsInterval();
 
   // Once we have successfully registered, we should send a heartbeat.
   EXPECT_CALL(gcm_driver_, SendImpl(kHeartbeatGCMAppID, _, IsHeartbeatMsg()));
   gcm_driver_.CompleteRegistration(
       kHeartbeatGCMAppID, gcm::GCMClient::SUCCESS);
   task_runner_->RunPendingTasks();
 }
 
+TEST_F(HeartbeatSchedulerTest, StoreResetDuringRegistration) {
+  IgnoreUpstreamNotificationMsg();
+
+  EXPECT_CALL(gcm_driver_, RegisterImpl(kHeartbeatGCMAppID, _));
+  settings_helper_.SetBoolean(chromeos::kHeartbeatEnabled, true);
+  testing::Mock::VerifyAndClearExpectations(&gcm_driver_);
+
+  gcm_driver_.ResetStore();
+
+  IgnoreUpstreamNotificationMsg();
+
+  // Successful registration handled ok despite store reset.
+  EXPECT_FALSE(task_runner_->HasPendingTask());
+  EXPECT_CALL(gcm_driver_, SendImpl(kHeartbeatGCMAppID, _, IsHeartbeatMsg()));
+  gcm_driver_.CompleteRegistration(
+      kHeartbeatGCMAppID, gcm::GCMClient::SUCCESS);
+  EXPECT_EQ(1U, task_runner_->NumPendingTasks());
+  task_runner_->RunPendingTasks();
+  testing::Mock::VerifyAndClearExpectations(&gcm_driver_);
+}
+
+TEST_F(HeartbeatSchedulerTest, StoreResetAfterRegistration) {
+  IgnoreUpstreamNotificationMsg();
+
+  // Start from a successful registration.
+  EXPECT_CALL(gcm_driver_, RegisterImpl(kHeartbeatGCMAppID, _));
+  settings_helper_.SetBoolean(chromeos::kHeartbeatEnabled, true);
+  EXPECT_CALL(gcm_driver_, SendImpl(kHeartbeatGCMAppID, _, IsHeartbeatMsg()));
+  gcm_driver_.CompleteRegistration(
+      kHeartbeatGCMAppID, gcm::GCMClient::SUCCESS);
+  EXPECT_EQ(1U, task_runner_->NumPendingTasks());
+  task_runner_->RunPendingTasks();
+  testing::Mock::VerifyAndClearExpectations(&gcm_driver_);
+
+  gcm_driver_.IgnoreDefaultHeartbeatsInterval();
+
+  // Reseting the store should trigger re-registration.
+  EXPECT_CALL(gcm_driver_, RegisterImpl(kHeartbeatGCMAppID, _));
+  gcm_driver_.ResetStore();
+  testing::Mock::VerifyAndClearExpectations(&gcm_driver_);
+
+  IgnoreUpstreamNotificationMsg();
+
+  // Once we have successfully re-registered, we should send a heartbeat.
+  EXPECT_FALSE(task_runner_->HasPendingTask());
+  EXPECT_CALL(gcm_driver_, SendImpl(kHeartbeatGCMAppID, _, IsHeartbeatMsg()));
+  gcm_driver_.CompleteRegistration(
+      kHeartbeatGCMAppID, gcm::GCMClient::SUCCESS);
+  EXPECT_EQ(1U, task_runner_->NumPendingTasks());
+  task_runner_->RunPendingTasks();
+  testing::Mock::VerifyAndClearExpectations(&gcm_driver_);
+}
+
 TEST_F(HeartbeatSchedulerTest, ChangeHeartbeatFrequency) {
   IgnoreUpstreamNotificationMsg();
 
   EXPECT_CALL(gcm_driver_, RegisterImpl(kHeartbeatGCMAppID, _));
   settings_helper_.SetBoolean(chromeos::kHeartbeatEnabled, true);
   gcm_driver_.CompleteRegistration(
       kHeartbeatGCMAppID, gcm::GCMClient::SUCCESS);
 
   EXPECT_EQ(1U, task_runner_->NumPendingTasks());
   // Should have a heartbeat task posted with zero delay on startup.
@@ skipping 127 matching lines @@
 
   EXPECT_CALL(gcm_driver_,
               SendImpl(kHeartbeatGCMAppID, _, IsUpstreamNotificationMsg()))
       .Times(AtLeast(1));
   gcm_driver_.CompleteRegistration(kHeartbeatGCMAppID, gcm::GCMClient::SUCCESS);
 
   gcm_driver_.NotifyConnected();
 }
 
 }  // namespace