[GCM] Adding basic G-services handling

google_apis/gcm/engine/gcm_store.h

 // 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_GCM_STORE_H_
 #define GOOGLE_APIS_GCM_ENGINE_GCM_STORE_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #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"
 
 namespace google {
 namespace protobuf {
 class MessageLite;
 }  // namespace protobuf
 }  // namespace google
 
@@ skipping 13 matching lines @@
   struct GCM_EXPORT LoadResult {
     LoadResult();
     ~LoadResult();
 
     bool success;
     uint64 device_android_id;
     uint64 device_security_token;
     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;
   typedef base::Callback<void(scoped_ptr<LoadResult> result)> LoadCallback;
   typedef base::Callback<void(bool success)> UpdateCallback;
 
   GCMStore();
   virtual ~GCMStore();
 
   // Load the data from persistent store and pass the initial state back to
@@ skipping 34 matching lines @@
                                   const MCSMessage& message,
                                   const UpdateCallback& callback) = 0;
   virtual void OverwriteOutgoingMessage(const std::string& persistent_id,
                                         const MCSMessage& message,
                                         const UpdateCallback& callback) = 0;
   virtual void RemoveOutgoingMessage(const std::string& persistent_id,
                                      const UpdateCallback& callback) = 0;
   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);
 };
 
 }  // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_ENGINE_GCM_STORE_H_