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

chrome/browser/chromeos/policy/heartbeat_scheduler.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 <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 229 matching lines @@
 
   bool enabled;
   if (settings->GetBoolean(chromeos::kHeartbeatEnabled, &enabled))
     heartbeat_enabled_ = enabled;
 
   if (!heartbeat_enabled_) {
     // Heartbeats are no longer enabled - cancel our callback and any
     // outstanding registration attempts and disconnect from GCM so the
     // connection can be shut down. If heartbeats are re-enabled later, we
     // will re-register with GCM.
-    heartbeat_callback_.Cancel();
     ShutdownGCM();
   } else {
     // Schedule a new upload with the new frequency.
     ScheduleNextHeartbeat();
   }
 
   DVLOG(1) << "heartbeat enabled: " << heartbeat_enabled_;
   DVLOG(1) << "heartbeat frequency: " << heartbeat_interval_;
 }
 
 void HeartbeatScheduler::ShutdownGCM() {
+  heartbeat_callback_.Cancel();
   registration_helper_.reset();
   registration_id_.clear();
   if (registered_app_handler_) {
     registered_app_handler_ = false;
     gcm_driver_->RemoveHeartbeatInterval(kHeartbeatSchedulerScope);
     gcm_driver_->RemoveAppHandler(kHeartbeatGCMAppID);
     gcm_driver_->RemoveConnectionObserver(this);
   }
 }
 
@@ skipping 145 matching lines @@
 
 void HeartbeatScheduler::ShutdownHandler() {
   // This should never be called, because BrowserProcessImpl::StartTearDown()
   // should shutdown the BrowserPolicyConnector (which destroys this object)
   // before the GCMDriver. Our goal is to make sure that this object is always
   // shutdown before GCMDriver is shut down, rather than trying to handle the
   // case when GCMDriver goes away.
   NOTREACHED() << "HeartbeatScheduler should be destroyed before GCMDriver";
 }
 
+void HeartbeatScheduler::OnStoreReset() {
+  // TODO(crbug.com/661660): Tell server that |registration_id_| is no longer
+  // valid. See also crbug.com/516375.
+  ShutdownGCM();

[Andrew T Wilson (Slow), 2016/11/09 08:19:39]

Problem is that this will shutdown our GCM connection permanently until the next
reboot. I think you need to invoke RefreshHeartbeatSettings() after calling
ShutdownGCM() to re-initialize the GCM connection.

Also, can you add a test to make sure we do the right thing here?

[johnme, 2016/11/09 19:33:48]

Makes sense.
I've added a pair of tests to theoretically test HeartbeatScheduler's behavior
here. Gonna have to run them via the try bots since I don't have a ChromeOS dev
machine, so they might not even compile yet :)

+}
+
 void HeartbeatScheduler::OnMessage(const std::string& app_id,
                                    const gcm::IncomingMessage& message) {
   // Should never be called because we don't get any incoming messages
   // for our app ID.
   NOTREACHED() << "Received incoming message for " << app_id;
 }
 
 void HeartbeatScheduler::OnMessagesDeleted(const std::string& app_id) {
 }
 
@@ skipping 11 matching lines @@
 void HeartbeatScheduler::OnConnected(const net::IPEndPoint&) {
   SignUpUpstreamNotification();
 }
 
 void HeartbeatScheduler::OnGcmIdUpdateRequestSent(bool success) {
   // TODO(binjin): Handle the failure, probably by exponential backoff.
   LOG_IF(WARNING, !success) << "Failed to send GCM id to DM server";
 }
 
 }  // namespace policy