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

components/gcm_driver/gcm_internals_helper.cc

 // Copyright 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 "components/gcm_driver/gcm_internals_helper.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/format_macros.h"
+#include "base/i18n/time_formatting.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "components/gcm_driver/gcm_activity.h"
 #include "components/gcm_driver/gcm_internals_constants.h"
 #include "components/gcm_driver/gcm_profile_service.h"
 
 namespace gcm_driver {
 
 namespace {
 
 void SetCheckinInfo(const std::vector<gcm::CheckinActivity>& checkins,
@@ skipping 87 matching lines @@
   if (stats) {
     results->SetBoolean(kIsRecording, stats->is_recording);
     device_info->SetBoolean(kGcmClientCreated, stats->gcm_client_created);
     device_info->SetString(kGcmClientState, stats->gcm_client_state);
     device_info->SetBoolean(kConnectionClientCreated,
                             stats->connection_client_created);
     device_info->SetString(kRegisteredAppIds,
                            base::JoinString(stats->registered_app_ids, ","));
     if (stats->connection_client_created)
       device_info->SetString(kConnectionState, stats->connection_state);
+    device_info->SetString(
+        kLastCheckin, base::UTF16ToUTF8(base::TimeFormatFriendlyDateAndTime(
+                          stats->last_checkin)));

[Peter Beverloo, 2016/10/28 15:52:30]

last_checkin can be NULL here when the CheckinRequest is still retrying, in
which case TimeFormatFriendlyDateAndTime returns a date in 1969 -- probably want
the !is_null check here too.

[Nicolas Zea, 2016/11/01 00:18:16]

Done.

+    if (!stats->next_checkin.is_null()) {
+      device_info->SetString(
+          kNextCheckin, base::UTF16ToUTF8(base::TimeFormatFriendlyDateAndTime(
+                            stats->next_checkin)));
+    }
     if (stats->android_id > 0) {
       device_info->SetString(
           kAndroidId, base::StringPrintf("0x%" PRIx64, stats->android_id));
     }
     device_info->SetInteger(kSendQueueSize, stats->send_queue_size);
     device_info->SetInteger(kResendQueueSize, stats->resend_queue_size);
 
     if (stats->recorded_activities.checkin_activities.size() > 0) {
       base::ListValue* checkin_info = new base::ListValue();
       results->Set(kCheckinInfo, checkin_info);
@@ skipping 28 matching lines @@
       base::ListValue* failure_info = new base::ListValue();
       results->Set(kDecryptionFailureInfo, failure_info);
       SetDecryptionFailureInfo(
           stats->recorded_activities.decryption_failure_activities,
           failure_info);
     }
   }
 }
 
 }  // namespace gcm_driver