[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..a7c40c1680a70bcfcba438fc32c62208a351e95c 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;

[Nicolas Zea, 2014/03/28 22:56:53]

nit: the g_* prefix is typically used for globals (e.g. g_browser_process), so
this is a bit confusing. How about just calling it gservices_settings (here and
elsewhere).

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

Done.

+    base::Time last_checkin_time;
   };
 
   typedef std::vector<std::string> PersistentIdList;
@@ -101,6 +104,15 @@ class GCM_EXPORT GCMStore {
   virtual void RemoveOutgoingMessages(const PersistentIdList& persistent_ids,
                                       const UpdateCallback& callback) = 0;
 
+  // GService Settings handling.
+  // |settings_to_remove| and |settings_to_add| don't need to be mutually
+  // exclusive. This will happen when the whole settings map is replaced.
+  virtual void UpdateGServicesSettings(
+      const std::vector<std::string>& settings_to_remove,
+      const std::map<std::string, std::string>& settings_to_add,
+      const base::Time& last_checkin_time,
+      const UpdateCallback& callback) = 0;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(GCMStore);
 };