[GCM] Adding basic G-services handling

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 659fc7f9d1eaa2950a4732f9c5da87ac9b4b95af..aaf8a67360134566469ce7f89153328b49ce8d10 100644
--- a/google_apis/gcm/engine/gcm_store.h
+++ b/google_apis/gcm/engine/gcm_store.h
@@ -14,6 +14,7 @@
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/time/time.h"
 #include "google_apis/gcm/base/gcm_export.h"
 #include "google_apis/gcm/engine/registration_info.h"
 #include "google_apis/gcm/protocol/mcs.pb.h"
@@ -47,6 +48,8 @@ class GCM_EXPORT GCMStore {
     RegistrationInfoMap registrations;
     std::vector<std::string> incoming_messages;
     OutgoingMessageMap outgoing_messages;
+    std::map<std::string, std::string> g_services_settings;
+    base::Time last_checkin_time;
   };
 
   typedef std::vector<std::string> PersistentIdList;
@@ -101,6 +104,12 @@ class GCM_EXPORT GCMStore {
   virtual void RemoveOutgoingMessages(const PersistentIdList& persistent_ids,
                                       const UpdateCallback& callback) = 0;
 
+  // GService Settings handling.

[Nicolas Zea, 2014/03/28 18:31:38]

Comment whether it's assumed settings_to_remove and settings_to_add are mutually
exclusive or not.

[fgorski, 2014/03/29 01:09:32]

Done.

+  virtual void UpdateGServicesSettings(

[fgorski, 2014/03/28 14:30:51]

we should pass last_checkin_time in to ensure we take advantage of the clock in
GCM Client -> makes it testable.

[Nicolas Zea, 2014/03/28 18:31:38]

Yeah, that should be persisted in a separate call from the settings themselves I
think

[fgorski, 2014/03/29 01:09:32]

No it should not. The settings will be updated only upon successful checkin if I
am not mistaken, and if we have that setting separately, we will have to wait
for two calls (and always make 2 calls). I'd rather make a call where either or
both of the collections is empty, but the last_checkin_time is still updated.

Is that reasonable?

[fgorski, 2014/03/29 01:09:32]

Done.

+      const std::vector<std::string>& settings_to_remove,
+      const std::map<std::string, std::string>& settings_to_add,
+      const UpdateCallback& callback) = 0;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(GCMStore);
 };