Fixing the super-long delay when GCMAccountTracker posts a task

chrome/browser/services/gcm/gcm_account_tracker.cc

 // 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.
 
 #include "chrome/browser/services/gcm/gcm_account_tracker.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/time/time.h"
@@ skipping 62 matching lines @@
     }
   }
 
   if (IsTokenReportingRequired())
     ReportTokens();
   else
     ScheduleReportTokens();
 }
 
 void GCMAccountTracker::ScheduleReportTokens() {
+  // Shortcutting here, in case GCM Driver is not yet connected. In that case
+  // reporting will be scheduled/started when the connection is made.
+  if (!driver_->IsConnected())
+    return;
+
   DVLOG(1) << "Deferring the token reporting for: "
            << GetTimeToNextTokenReporting().InSeconds() << " seconds.";
 
   reporting_weak_ptr_factory_.InvalidateWeakPtrs();
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&GCMAccountTracker::ReportTokens,
                  reporting_weak_ptr_factory_.GetWeakPtr()),
       GetTimeToNextTokenReporting());
 }
@@ skipping 64 matching lines @@
       iter->second.access_token.clear();
       iter->second.state = ACCOUNT_REMOVED;
     }
   }
 
   DeleteTokenRequest(request);
   ReportTokens();
 }
 
 void GCMAccountTracker::OnConnected(const net::IPEndPoint& ip_endpoint) {
+  // We are sure here, that GCM is running and connected. We can start reporting
+  // tokens if reporting is due now, or schedule reporting for later.
   if (IsTokenReportingRequired())
     ReportTokens();
+  else
+    ScheduleReportTokens();
 }
 
 void GCMAccountTracker::OnDisconnected() {
   // We are disconnected, so no point in trying to work with tokens.
 }
 
 void GCMAccountTracker::ReportTokens() {
   SanitizeTokens();
   // Make sure all tokens are valid.
   if (IsTokenFetchingRequired()) {
@@ skipping 90 matching lines @@
   }
 
   return token_needed;
 }
 
 base::TimeDelta GCMAccountTracker::GetTimeToNextTokenReporting() const {
   base::TimeDelta time_till_next_reporting =
       driver_->GetLastTokenFetchTime() +
       base::TimeDelta::FromMilliseconds(kTokenReportingIntervalMs) -
       base::Time::Now();
-  return time_till_next_reporting < base::TimeDelta() ?
-             base::TimeDelta() : time_till_next_reporting;
+
+  // Case when token fetching is overdue.
+  if (time_till_next_reporting < base::TimeDelta())
+    return base::TimeDelta();
+
+  // Case when calculated period is larger than expected, including the
+  // situation when the method is called before GCM driver is completely
+  // initialized.
+  if (time_till_next_reporting >
+          base::TimeDelta::FromMilliseconds(kTokenReportingIntervalMs)) {
+    return base::TimeDelta::FromMilliseconds(kTokenReportingIntervalMs);
+  }
+
+  return time_till_next_reporting;
 }
 
 void GCMAccountTracker::DeleteTokenRequest(
     const OAuth2TokenService::Request* request) {
   ScopedVector<OAuth2TokenService::Request>::iterator iter = std::find(
       pending_token_requests_.begin(), pending_token_requests_.end(), request);
   if (iter != pending_token_requests_.end())
     pending_token_requests_.erase(iter);
 }
 
@@ skipping 52 matching lines @@
   iter->second.state = ACCOUNT_REMOVED;
   ReportTokens();
 }
 
 OAuth2TokenService* GCMAccountTracker::GetTokenService() {
   DCHECK(account_tracker_->identity_provider());
   return account_tracker_->identity_provider()->GetTokenService();
 }
 
 }  // namespace gcm