[GCM] Adding status to AccountMapping structure

google_apis/gcm/engine/account_mapping.h

Index: google_apis/gcm/engine/account_mapping.h
diff --git a/google_apis/gcm/engine/account_mapping.h b/google_apis/gcm/engine/account_mapping.h
new file mode 100644
index 0000000000000000000000000000000000000000..10fa6dceccd96791bbbf7358d2a5c8014491ed93
--- /dev/null
+++ b/google_apis/gcm/engine/account_mapping.h
@@ -0,0 +1,68 @@
+// 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.
+
+#ifndef GOOGLE_APIS_GCM_ENGINE_ACCOUNT_MAPPING_H_
+#define GOOGLE_APIS_GCM_ENGINE_ACCOUNT_MAPPING_H_
+
+#include <string>
+
+#include "base/basictypes.h"
+#include "base/time/time.h"
+#include "google_apis/gcm/base/gcm_export.h"
+
+namespace gcm {
+
+// Stores information about Account mapping and a last message sent regarding
+// that mapping.
+struct GCM_EXPORT AccountMapping {
+  // Status of the account mapping.
+  enum MappingStatus {
+    NEW,       // This is a new account mapping entry.
+    ADDING,    // A mapping message has been sent, but it has not been confirmed
+               // yet.
+    MAPPED,    // Account is mapped. At least one message has been confirmed to
+               // reached the GCM.
+    REMOVING,  // Account is removed, but a message removing the mapping has not
+               // been confirmed yet.
+    REMOVED,   // Account is removed, and at least one message has been
+               // confirmed to have reached the GCM.
+  };
+
+  // Indicates whether a message, if sent, was adding or removing account
+  // mapping.
+  enum MessageType {
+    MSG_NONE,    // No message has been sent.
+    MSG_ADD,     // Account was mapped to device by the message.
+    MSG_REMOVE,  // Account mapping to device was removed by the message.
+  };
+
+  AccountMapping();
+  ~AccountMapping();
+
+  // Serializes account mapping to string without |account_id|, |status| or
+  // |access_token|.
+  std::string SerializeAsString() const;
+  // Parses account mapping from store, without |account_id| or |access_token|.
+  // |status| is infered.
+  bool ParseFromString(const std::string& value);
+
+  // Gaia ID of the account. (Acts as key for persistence.)
+  std::string account_id;
+  // Email address of the tracked account.
+  std::string email;
+  // OAuth2 access token used to authenticate mappings (not persisted).
+  std::string access_token;
+  // Status of the account mapping (not persisted).
+  MappingStatus status;
+  // Time of the mapping status change.
+  base::Time status_change_timestamp;
+  // Type of the last mapping message sent to GCM.
+  MessageType last_message_type;
+  // ID of the last mapping message sent to GCM.
+  std::string last_message_id;
+};
+
+}  // namespace gcm
+
+#endif  // GOOGLE_APIS_GCM_ENGINE_ACCOUNT_MAPPING_H_