Support getting and deleting token for Instance ID.

google_apis/gcm/engine/gcm_store.h

Index: google_apis/gcm/engine/gcm_store.h
diff --git a/google_apis/gcm/engine/gcm_store.h b/google_apis/gcm/engine/gcm_store.h
index cfefe914b45ddc4b86d1fac8a65b39a5dd8dc075..26af17a82e51b81f6f1be3149272bae35ce4cb63 100644
--- a/google_apis/gcm/engine/gcm_store.h
+++ b/google_apis/gcm/engine/gcm_store.h
@@ -20,7 +20,6 @@
 #include "base/time/time.h"
 #include "google_apis/gcm/base/gcm_export.h"
 #include "google_apis/gcm/engine/account_mapping.h"
-#include "google_apis/gcm/engine/registration_info.h"
 
 namespace gcm {
 
@@ -47,7 +46,7 @@ class GCM_EXPORT GCMStore {
     bool success;
     uint64 device_android_id;
     uint64 device_security_token;
-    RegistrationInfoMap registrations;
+    std::map<std::string, std::string> registrations;
     std::vector<std::string> incoming_messages;
     OutgoingMessageMap outgoing_messages;
     std::map<std::string, std::string> gservices_settings;
@@ -83,10 +82,10 @@ class GCM_EXPORT GCMStore {
                                     const UpdateCallback& callback) = 0;
 
   // Registration info.
-  virtual void AddRegistration(const std::string& app_id,
-                               const linked_ptr<RegistrationInfo>& registration,
+  virtual void AddRegistration(const std::string& serialized_key,

[Nicolas Zea, 2015/05/15 20:37:01]

Does it make sense to just pass in something equivalent to a RegistrationInfo,
which encapsulate both the app id/sender id or instance id information? Having
this be an arbitrary key/value string pair seems too generic.

[jianli, 2015/05/21 00:41:15]

We've already passed a serialized string from store front-end to back-end for
registrations to workaround the bug that linked_ptr is not thread-safe.  We
could try to bring something equivalent to RegistrationInfo, but we need to make
a couple copies which are not efficient. So it seems to me that it might be
better to keep serialization/deserliazation logic in GCMClient layer, instead of
making GCMStore more complicated.

[Nicolas Zea, 2015/05/21 21:07:51]

Fair enough. Could we give these more precise names though? For example keep
app_id and make serialized_value serialized_registration?

[jianli, 2015/05/21 23:11:24]

I can't just make app_id key for registrations since it does not work for
persisting InstanceID token records. For each app, there could be multiple token
records that are identified by pair of authorized entity and scope. So the key
to store InstanceID token records is indeed <app_id, authorized_entity, scope>.
I've updated the comment.

+                               const std::string& serialized_value,
                                const UpdateCallback& callback) = 0;
-  virtual void RemoveRegistration(const std::string& app_id,
+  virtual void RemoveRegistration(const std::string& serialized_key,
                                   const UpdateCallback& callback) = 0;
 
   // Unacknowledged incoming message handling.