Reset the GCM store to recover from it when it is busted

components/gcm_driver/gcm_client_impl.h

Index: components/gcm_driver/gcm_client_impl.h
diff --git a/components/gcm_driver/gcm_client_impl.h b/components/gcm_driver/gcm_client_impl.h
index cf1b33b940d2d77594fbcff55cb5611efb6b2e43..801a2251d735ee63cdd424dfeaf471c9aec6e402 100644
--- a/components/gcm_driver/gcm_client_impl.h
+++ b/components/gcm_driver/gcm_client_impl.h
@@ -198,8 +198,8 @@ class GCMClientImpl
   void OnFirstTimeDeviceCheckinCompleted(const CheckinInfo& checkin_info);
   // Starts a login on mcs_client_.
   void StartMCSLogin();
-  // Resets state to before initialization.
-  void ResetState();
+  // Resets the GCM store when it is corrupted.
+  void ResetStore();
   // Sets state to ready. This will initiate the MCS login and notify the
   // delegates.
   void OnReady(const std::vector<AccountMapping>& account_mappings,
@@ -237,6 +237,9 @@ class GCMClientImpl
   // Callback for store operation where result does not matter.
   void IgnoreWriteResultCallback(bool success);
 
+  // Callback for resetting the GCM store.
+  void ResetStoreCallback(bool success);
+
   // Completes the registration request.
   void OnRegisterCompleted(const std::string& app_id,
                            const std::vector<std::string>& sender_ids,
@@ -303,6 +306,10 @@ class GCMClientImpl
   // Data loaded from the GCM store.
   scoped_ptr<GCMStore::LoadResult> load_result_;
 
+  // Tracks if the GCM store has been reset. This is used to prevent from
+  // resetting and loading from the store again and again.
+  bool gcm_store_reset_;
+
   scoped_refptr<net::HttpNetworkSession> network_session_;
   net::BoundNetLog net_log_;
   scoped_ptr<ConnectionFactory> connection_factory_;