[GCM] Check-in with signed in accounts associates device to user

components/gcm_driver/gcm_client_impl.h

Index: components/gcm_driver/gcm_client_impl.h
diff --git a/components/gcm_driver/gcm_client_impl.h b/components/gcm_driver/gcm_client_impl.h
index 0ce19d6d6cf91e61a5456747864c1b6fc01bb735..8eaca628f08639e3f464f379357bdc0e94e0dbe7 100644
--- a/components/gcm_driver/gcm_client_impl.h
+++ b/components/gcm_driver/gcm_client_impl.h
@@ -101,6 +101,9 @@ class GCMClientImpl
   virtual void SetRecording(bool recording) OVERRIDE;
   virtual void ClearActivityLogs() OVERRIDE;
   virtual GCMStatistics GetStatistics() const OVERRIDE;
+  virtual void SetAccountsForCheckin(
+      const std::map<std::string, std::string>& account_tokens,
+      bool account_removed) OVERRIDE;
 
   // GCMStatsRecorder::Delegate implemenation.
   virtual void OnActivityRecorded() OVERRIDE;
@@ -129,15 +132,16 @@ class GCMClientImpl
 
   // The check-in info for the user. Returned by the server.

[fgorski, 2014/07/10 20:20:08]

update documentation

[fgorski, 2014/07/11 22:51:21]

Done.

   struct CheckinInfo {
-    CheckinInfo() : android_id(0), secret(0) {}
+    CheckinInfo();
+    ~CheckinInfo();
     bool IsValid() const { return android_id != 0 && secret != 0; }
-    void Reset() {
-      android_id = 0;
-      secret = 0;
-    }
+    void Reset();
 
     uint64 android_id;
     uint64 secret;
+    uint64 last_checkin_accounts_count;
+    bool accounts_set;
+    std::map<std::string, std::string> account_tokens;
   };
 
   // Collection of pending registration requests. Keys are app IDs, while values
@@ -200,7 +204,7 @@ class GCMClientImpl
   // Gets the time until next checkin.
   base::TimeDelta GetTimeToNextCheckin() const;
   // Callback for setting last checkin time in the |gcm_store_|.

[fgorski, 2014/07/10 20:20:08]

update documentation

[fgorski, 2014/07/11 22:51:21]

Done.

-  void SetLastCheckinTimeCallback(bool success);
+  void SetLastCheckinInfoCallback(bool success);
 
   // Callback for persisting device credentials in the |gcm_store_|.
   void SetDeviceCredentialsCallback(bool success);