[GCM] Handling connection events in GCMAccountTracker

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 628e1edc50f7e78532a8abcec5f70fb7d2e299d1..f50dd87b5a6263dd84b0ebc42ab3e6ad9778d971 100644
--- a/chrome/browser/services/gcm/gcm_account_tracker.h
+++ b/chrome/browser/services/gcm/gcm_account_tracker.h
@@ -10,15 +10,19 @@
 
 #include "base/memory/scoped_vector.h"
 #include "components/gcm_driver/gcm_client.h"
+#include "components/gcm_driver/gcm_connection_observer.h"
 #include "google_apis/gaia/account_tracker.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 
 namespace gcm {
 
+class GCMDriver;
+
 // Class for reporting back which accounts are signed into. It is only meant to
 // be used when the user is signed into sync.
 class GCMAccountTracker : public gaia::AccountTracker::Observer,
-                          public OAuth2TokenService::Consumer {
+                          public OAuth2TokenService::Consumer,
+                          public GCMConnectionObserver {
  public:
   // State of the account.
   // Allowed transitions:
@@ -46,23 +50,17 @@ class GCMAccountTracker : public gaia::AccountTracker::Observer,
     std::string email;
     // OAuth2 access token, when |state| is TOKEN_PRESENT.
     std::string access_token;
+    // Expiration time of the access tokens.
+    base::Time expiration_time;
     // Status of the token fetching.
     AccountState state;
   };
 
-  // Callback for the GetAccountsForCheckin call. |account_tokens|: list of
-  // email addresses, account ids and OAuth2 access tokens.
-  typedef base::Callback<void(const std::vector<GCMClient::AccountTokenInfo>&
-                                  account_tokens)> UpdateAccountsCallback;
-
   // Creates an instance of GCMAccountTracker. |account_tracker| is used to

[Nicolas Zea, 2014/10/08 00:36:35]

nit: "Creates an instance.." isn't really necessary. All constructors do that.

[fgorski, 2014/10/08 18:04:27]

Done.

-  // deliver information about the account, while |callback| will be called
-  // once all of the accounts have been fetched a necessary OAuth2 token, as
-  // many times as the list of accounts is stable, meaning that all accounts
-  // are known and there is no related activity in progress for them, like
-  // fetching OAuth2 tokens.
+  // deliver information about the accounts present in the browser context to
+  // |driver|.
   GCMAccountTracker(scoped_ptr<gaia::AccountTracker> account_tracker,
-                    const UpdateAccountsCallback& callback);
+                    GCMDriver* driver);
   virtual ~GCMAccountTracker();
 
   // Shuts down the tracker ensuring a proper clean up. After Shutdown() is
@@ -72,8 +70,11 @@ class GCMAccountTracker : public gaia::AccountTracker::Observer,
 
   // Starts tracking accounts.
   void Start();
-  // Stops tracking accounts. Cancels all of the pending token requests.
-  void Stop();
+
+  // Gets the number of pending token requests. Only used for testing.
+  size_t get_pending_token_request_count() const {
+    return pending_token_requests_.size();
+  }
 
  private:
   // Maps account keys to account states. Keyed by account_ids as used by
@@ -93,9 +94,17 @@ class GCMAccountTracker : public gaia::AccountTracker::Observer,
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
                                  const GoogleServiceAuthError& error) override;
 
+  // GCMConnectionObserver overrides.
+  virtual void OnConnected(const net::IPEndPoint& ip_endpoint) OVERRIDE;

[Nicolas Zea, 2014/10/08 00:36:35]

nit: OVERRIDE -> override (chromium is using the C++11 versions now)

[fgorski, 2014/10/08 18:04:27]

Done.

+  virtual void OnDisconnected() OVERRIDE;
+
   // Report the list of accounts with OAuth2 tokens back using the |callback_|
   // function. If there are token requests in progress, do nothing.
   void CompleteCollectingTokens();
+  // Verify that all of the tokens are ready to be passed down to the GCM
+  // Driver, e.g. none of them has expired or is missing. Returns true if not
+  // all tokens are valid and a fetching yet more tokens is required.
+  bool SanitizeTokens();

[Nicolas Zea, 2014/10/08 00:36:35]

nit: I think it might be a bit clearer if returning true meant success, i.e.
everything is ready, and returning false meant failure, i.e. tokens are still
needed.

[fgorski, 2014/10/08 18:04:27]

I agree, but with the next patch I'm actually removing return type.
SanitizeTokens will clean up. IsTokenFetchingNeeded() will be returning the
proper information.

This will be resolved in 631343002

   // Deletes a token request. Should be called from OnGetTokenSuccess(..) or
   // OnGetTokenFailure(..).
   void DeleteTokenRequest(const OAuth2TokenService::Request* request);
@@ -114,9 +123,8 @@ class GCMAccountTracker : public gaia::AccountTracker::Observer,
   // Account tracker.
   scoped_ptr<gaia::AccountTracker> account_tracker_;
 
-  // Callback to be called after all of the account and OAuth2 tokens are
-  // collected.
-  UpdateAccountsCallback callback_;
+  // GCM Driver. Not owned.
+  GCMDriver* driver_;
 
   // State of the account.
   AccountInfos account_infos_;