[GCM] Reset store on checkin rejection and add checkin state to internals

google_apis/gcm/engine/checkin_request.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 "google_apis/gcm/engine/checkin_request.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "google_apis/gcm/monitoring/gcm_stats_recorder.h"
 #include "google_apis/gcm/protocol/checkin.pb.h"
 #include "net/base/load_flags.h"
-#include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
 
 namespace gcm {
 
 namespace {
 const char kRequestContentType[] = "application/x-protobuf";
 const int kRequestVersionValue = 3;
 const int kDefaultUserSerialNumber = 0;
 
@@ skipping 162 matching lines @@
       source->GetResponseCode());
   if (response_status == net::HTTP_BAD_REQUEST ||
       response_status == net::HTTP_UNAUTHORIZED) {
     // BAD_REQUEST indicates that the request was malformed.
     // UNAUTHORIZED indicates that security token didn't match the android id.
     LOG(ERROR) << "No point retrying the checkin with status: "
                << response_status << ". Checkin failed.";
     CheckinRequestStatus status = response_status == net::HTTP_BAD_REQUEST ?
         HTTP_BAD_REQUEST : HTTP_UNAUTHORIZED;
     RecordCheckinStatusAndReportUMA(status, recorder_, false);
-    callback_.Run(response_proto);
+    callback_.Run(response_status, response_proto);
     return;
   }
 
   if (response_status != net::HTTP_OK ||
       !source->GetResponseAsString(&response_string) ||
       !response_proto.ParseFromString(response_string)) {
     LOG(ERROR) << "Failed to get checkin response. HTTP Status: "
                << response_status << ". Retrying.";
     CheckinRequestStatus status = response_status != net::HTTP_OK ?
         HTTP_NOT_OK : RESPONSE_PARSING_FAILED;
@@ skipping 10 matching lines @@
     RecordCheckinStatusAndReportUMA(ZERO_ID_OR_TOKEN, recorder_, true);
     RetryWithBackoff();
     return;
   }
 
   RecordCheckinStatusAndReportUMA(SUCCESS, recorder_, false);
   UMA_HISTOGRAM_COUNTS("GCM.CheckinRetryCount",
                        backoff_entry_.failure_count());
   UMA_HISTOGRAM_TIMES("GCM.CheckinCompleteTime",
                       base::TimeTicks::Now() - request_start_time_);
-  callback_.Run(response_proto);
+  callback_.Run(response_status, response_proto);
 }
 
 }  // namespace gcm