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

components/gcm_driver/gcm_client_impl.cc

 // Copyright 2014 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 "components/gcm_driver/gcm_client_impl.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 794 matching lines @@
     LOG(ERROR) << "Failed to destroy GCM store";
     RecordResetStoreErrorToUMA(DESTROYING_STORE_FAILED);
     state_ = UNINITIALIZED;
     return;
   }
 
   state_ = INITIALIZED;
 }
 
 void GCMClientImpl::ResetStoreCallback(bool success) {
+  // Even an incomplete reset may invalidate registrations, and this might be
+  // the only opportunity to notify the delegate. For example a partial reset
+  // that deletes the "CURRENT" file will cause GCMStoreImpl to consider the DB
+  // to no longer exist, in which case the next load will simply create a new
+  // store rather than resetting it.
+  delegate_->OnStoreReset();
+
   if (!success) {
     LOG(ERROR) << "Failed to reset GCM store";
     RecordResetStoreErrorToUMA(DESTROYING_STORE_FAILED);
     state_ = UNINITIALIZED;
     return;
   }
 
   state_ = INITIALIZED;
   Start(start_mode_);
 }
@@ skipping 608 matching lines @@
 bool GCMClientImpl::HasStandaloneRegisteredApp() const {
   if (registrations_.empty())
     return false;
   // Note that account mapper is not counted as a standalone app since it is
   // automatically started when other app uses GCM.
   return registrations_.size() > 1 ||
          !ExistsGCMRegistrationInMap(registrations_, kGCMAccountMapperAppId);
 }
 
 }  // namespace gcm