[GCM] Update ResetStore histograms

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 215 matching lines @@
     ttl_category = TTL_LESS_THAN_OR_EQUAL_TO_ONE_DAY;
   else
     ttl_category = TTL_MAXIMUM;
 
   UMA_HISTOGRAM_ENUMERATION("GCM.OutgoingMessageTTL",
                             ttl_category,
                             TTL_CATEGORY_COUNT);
 }
 
 void RecordResetStoreErrorToUMA(ResetStoreError error) {
-  UMA_HISTOGRAM_ENUMERATION("GCM.ResetStore", error, RESET_STORE_ERROR_COUNT);
+  UMA_HISTOGRAM_ENUMERATION("GCM.ResetStoreError", error,
+                            RESET_STORE_ERROR_COUNT);
 }
 
 }  // namespace
 
 GCMInternalsBuilder::GCMInternalsBuilder() {}
 GCMInternalsBuilder::~GCMInternalsBuilder() {}
 
 std::unique_ptr<base::Clock> GCMInternalsBuilder::BuildClock() {
   return base::WrapUnique<base::Clock>(new base::DefaultClock());
 }
@@ skipping 140 matching lines @@
                          base::Bind(&GCMClientImpl::OnLoadCompleted,
                                     weak_ptr_factory_.GetWeakPtr()));
       } else {
         // In the case that the store does not exist, set |state_| back to
         // INITIALIZED such that store loading could be triggered again when
         // Start() is called with IMMEDIATE_START.
         state_ = INITIALIZED;
       }
     } else {
       // Otherwise, destroy the store to try again.
-      ResetStore();
+      ResetStore(LOAD_FAILURE);
     }
     return;
   }
   gcm_store_reset_ = false;
 
   device_checkin_info_.android_id = result->device_android_id;
   device_checkin_info_.secret = result->device_security_token;
   device_checkin_info_.last_checkin_accounts = result->last_checkin_accounts;
   // A case where there were previously no accounts reported with checkin is
   // considered to be the same as when the list of accounts is empty. It enables
@@ skipping 128 matching lines @@
 }
 
 void GCMClientImpl::DestroyStoreWhenNotNeeded() {
   if (state_ != LOADED || start_mode_ != DELAYED_START)
     return;
 
   gcm_store_->Destroy(base::Bind(&GCMClientImpl::DestroyStoreCallback,
                       weak_ptr_factory_.GetWeakPtr()));
 }
 
-void GCMClientImpl::ResetStore() {
+void GCMClientImpl::ResetStore(ResetReason reset_reason) {
   // If already being reset, don't do it again. We want to prevent from
   // resetting and loading from the store again and again.
   if (gcm_store_reset_) {
     RecordResetStoreErrorToUMA(INFINITE_STORE_RESET);
     state_ = UNINITIALIZED;
     return;
   }
   gcm_store_reset_ = true;
+  UMA_HISTOGRAM_ENUMERATION("GCM.ResetStoreReason", reset_reason,
+                            RESET_REASON_COUNT);
 
   // Destroy the GCM store to start over.
   gcm_store_->Destroy(base::Bind(&GCMClientImpl::ResetStoreCallback,
                       weak_ptr_factory_.GetWeakPtr()));
 }
 
 void GCMClientImpl::SetAccountTokens(
     const std::vector<AccountTokenInfo>& account_tokens) {
   device_checkin_info_.account_tokens.clear();
   for (std::vector<AccountTokenInfo>::const_iterator iter =
@@ skipping 134 matching lines @@
 }
 
 void GCMClientImpl::OnCheckinCompleted(
     net::HttpStatusCode response_code,
     const checkin_proto::AndroidCheckinResponse& checkin_response) {
   checkin_request_.reset();
 
   if (response_code == net::HTTP_UNAUTHORIZED ||
       response_code == net::HTTP_BAD_REQUEST) {
     LOG(ERROR) << "Checkin rejected. Resetting GCM Store.";
-    ResetStore();
+    ResetStore(CHECKIN_REJECTED);
     return;
   }
 
   DCHECK(checkin_response.has_android_id());
   DCHECK(checkin_response.has_security_token());
   CheckinInfo checkin_info;
   checkin_info.android_id = checkin_response.android_id();
   checkin_info.secret = checkin_response.security_token();
 
   if (state_ == INITIAL_DEVICE_CHECKIN) {
@@ skipping 713 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