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

chrome/browser/services/gcm/gcm_account_tracker.h

Index: chrome/browser/services/gcm/gcm_account_tracker.h
diff --git a/chrome/browser/services/gcm/gcm_account_tracker.h b/chrome/browser/services/gcm/gcm_account_tracker.h
index 9093ba73c122f8626703cf31cb1195389b22f0bd..bddf7a3c82054d55c30d82706e93da3a997f7431 100644
--- a/chrome/browser/services/gcm/gcm_account_tracker.h
+++ b/chrome/browser/services/gcm/gcm_account_tracker.h
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/memory/scoped_vector.h"
+#include "components/gcm_driver/gcm_client.h"

[fgorski, 2014/07/15 17:46:37]

remove

[fgorski, 2014/07/17 03:35:34]

Done.

 #include "google_apis/gaia/account_tracker.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 
@@ -50,11 +51,9 @@ class GCMAccountTracker : public gaia::AccountTracker::Observer,
   };
 
   // Callback for the GetAccountsForCheckin call. |account_tokens| maps email
-  // addresses to OAuth2 access tokens. |account_removed| indicates whether an
-  // account has been removed since the last time the callback was called.
-  typedef base::Callback<
-      void(const std::map<std::string, std::string>& account_tokens,
-           bool account_removed)> UpdateAccountsCallback;
+  // addresses to OAuth2 access tokens.
+  typedef base::Callback<void(const std::map<std::string, std::string>&
+                                  account_tokens)> UpdateAccountsCallback;
 
   // Creates an instance of GCMAccountTracker. |account_tracker| is used to
   // deliver information about the account, while |callback| will be called