Support getting and deleting token for Instance ID.

components/gcm_driver/gcm_client_impl.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 COMPONENTS_GCM_DRIVER_GCM_CLIENT_IMPL_H_
 #define COMPONENTS_GCM_DRIVER_GCM_CLIENT_IMPL_H_
 
 #include <map>
 #include <set>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
 #include "components/gcm_driver/gcm_client.h"
 #include "components/gcm_driver/gcm_stats_recorder_impl.h"
 #include "google_apis/gcm/base/mcs_message.h"
 #include "google_apis/gcm/engine/gcm_store.h"
@@ skipping 83 matching lines @@
   void Initialize(
       const ChromeBuildInfo& chrome_build_info,
       const base::FilePath& store_path,
       const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner,
       const scoped_refptr<net::URLRequestContextGetter>&
           url_request_context_getter,
       scoped_ptr<Encryptor> encryptor,
       GCMClient::Delegate* delegate) override;
   void Start(StartMode start_mode) override;
   void Stop() override;
-  void Register(const std::string& app_id,
-                const std::vector<std::string>& sender_ids) override;
-  void Unregister(const std::string& app_id) override;
+  void Register(const linked_ptr<RegistrationInfo>& registration_info) override;
+  void Unregister(
+      const linked_ptr<RegistrationInfo>& registration_info) override;
   void Send(const std::string& app_id,
             const std::string& receiver_id,
             const OutgoingMessage& message) override;
   void SetRecording(bool recording) override;
   void ClearActivityLogs() override;
   GCMStatistics GetStatistics() const override;
   void SetAccountTokens(
       const std::vector<AccountTokenInfo>& account_tokens) override;
   void UpdateAccountMapping(const AccountMapping& account_mapping) override;
   void RemoveAccountMapping(const std::string& account_id) override;
   void SetLastTokenFetchTime(const base::Time& time) override;
   void UpdateHeartbeatTimer(scoped_ptr<base::Timer> timer) override;
   void AddInstanceIDData(const std::string& app_id,
-                         const std::string& instance_id_data) override;
+                         const std::string& instance_id,
+                         const std::string& extra_data) override;
   void RemoveInstanceIDData(const std::string& app_id) override;
-  std::string GetInstanceIDData(const std::string& app_id) override;
+  void GetInstanceIDData(const std::string& app_id,
+                         std::string* instance_id,
+                         std::string* extra_data) override;
 
   // GCMStatsRecorder::Delegate implemenation.
   void OnActivityRecorded() override;
 
   // ConnectionFactory::ConnectionListener implementation.
   void OnConnected(const GURL& current_server,
                    const net::IPEndPoint& ip_endpoint) override;
   void OnDisconnected() override;
 
  private:
@@ skipping 13 matching lines @@
     // True if accounts were already provided through SetAccountsForCheckin(),
     // or when |last_checkin_accounts| was loaded as empty.
     bool accounts_set;
     // Map of account email addresses and OAuth2 tokens that will be sent to the
     // checkin server on a next checkin.
     std::map<std::string, std::string> account_tokens;
     // As set of accounts last checkin was completed with.
     std::set<std::string> last_checkin_accounts;
   };
 
-  // Collection of pending registration requests. Keys are app IDs, while values
-  // are pending registration requests to obtain a registration ID for
-  // requesting application.
-  typedef std::map<std::string, RegistrationRequest*>
-      PendingRegistrationRequests;
+  // Collection of pending registration requests. Keys are RegistrationInfo
+  // instance, while values are pending registration requests to obtain a
+  // registration ID for requesting application.
+  typedef std::map<linked_ptr<RegistrationInfo>,
+                   RegistrationRequest*,
+                   RegistrationInfoComparer> PendingRegistrationRequests;
 
-  // Collection of pending unregistration requests. Keys are app IDs, while
-  // values are pending unregistration requests to disable the registration ID
-  // currently assigned to the application.
-  typedef std::map<std::string, UnregistrationRequest*>
-      PendingUnregistrationRequests;
+  // Collection of pending unregistration requests. Keys are RegistrationInfo
+  // instance, while values are pending unregistration requests to disable the
+  // registration ID currently assigned to the application.
+  typedef std::map<linked_ptr<RegistrationInfo>,
+                   UnregistrationRequest*,
+                   RegistrationInfoComparer> PendingUnregistrationRequests;
 
   friend class GCMClientImplTest;
 
   // Returns text representation of the enum State.
   std::string GetStateString() const;
 
+  // Builds RequestInfo that is passed to registration/unregistration requests.
+  scoped_ptr<RegistrationRequest::RequestInfo>
+  BuildRegistrationRequestInfo(
+      const RegistrationInfo& registration_info) const;
+  scoped_ptr<UnregistrationRequest::RequestInfo>
+  BuildUnregistrationRequestInfo(
+      const RegistrationInfo& registration_info) const;
+
   // Callbacks for the MCSClient.
   // Receives messages and dispatches them to relevant user delegates.
   void OnMessageReceivedFromMCS(const gcm::MCSMessage& message);
   // Receives confirmation of sent messages or information about errors.
   void OnMessageSentToMCS(int64 user_serial_number,
                           const std::string& app_id,
                           const std::string& message_id,
                           MCSClient::MessageSendStatus status);
   // Receives information about mcs_client_ errors.
   void OnMCSError();
@@ skipping 45 matching lines @@
   // |gcm_store_| fails.
   void DefaultStoreCallback(bool success);
 
   // Callback for store operation where result does not matter.
   void IgnoreWriteResultCallback(bool success);
 
   // Callback for resetting the GCM store.
   void ResetStoreCallback(bool success);
 
   // Completes the registration request.
-  void OnRegisterCompleted(const std::string& app_id,
-                           const std::vector<std::string>& sender_ids,
-                           RegistrationRequest::Status status,
-                           const std::string& registration_id);
+  void OnRegisterCompleted(
+      const linked_ptr<RegistrationInfo>& registration_info,
+      RegistrationRequest::Status status,
+      const std::string& registration_id);
 
   // Completes the unregistration request.
-  void OnUnregisterCompleted(const std::string& app_id,
-                             UnregistrationRequest::Status status);
+  void OnUnregisterCompleted(
+      const linked_ptr<RegistrationInfo>& registration_info,
+      UnregistrationRequest::Status status);
 
   // Completes the GCM store destroy request.
   void OnGCMStoreDestroyed(bool success);
 
   // Handles incoming data message and dispatches it the delegate of this class.
   void HandleIncomingMessage(const gcm::MCSMessage& message);
 
   // Fires OnMessageReceived event on the delegate of this class, based on the
   // details in |data_message_stanza| and |message_data|.
   void HandleIncomingDataMessage(
@@ skipping 72 matching lines @@
   PendingUnregistrationRequests pending_unregistration_requests_;
   STLValueDeleter<PendingUnregistrationRequests>
       pending_unregistration_requests_deleter_;
 
   // G-services settings that were provided by MCS.
   GServicesSettings gservices_settings_;
 
   // Time of the last successful checkin.
   base::Time last_checkin_time_;
 
-  // Cached instance ID data, key is app id.
-  std::map<std::string, std::string> instance_id_data_;
+  // Cached instance ID data, key is app ID and value is pair of instance ID
+  // and extra data.
+  std::map<std::string, std::pair<std::string, std::string>> instance_id_data_;
 
   // Factory for creating references when scheduling periodic checkin.
   base::WeakPtrFactory<GCMClientImpl> periodic_checkin_ptr_factory_;
 
   // Factory for creating references in callbacks.
   base::WeakPtrFactory<GCMClientImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMClientImpl);
 };
 
 }  // namespace gcm
 
 #endif  // COMPONENTS_GCM_DRIVER_GCM_CLIENT_IMPL_H_