Fix to the GCM Account Tracker flooding on a stale refresh token

chrome/browser/services/gcm/gcm_account_tracker_unittest.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 <map>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 341 matching lines @@
 
 TEST_F(GCMAccountTrackerTest, GetTokenFailed) {
   SignInAccount(kAccountId1);
   SignInAccount(kAccountId2);
 
   tracker()->Start();
   IssueAccessToken(kAccountId1);
   EXPECT_FALSE(driver()->update_accounts_called());
 
   IssueError(kAccountId2);
-  EXPECT_FALSE(driver()->update_accounts_called());
 
-  EXPECT_EQ(1UL, tracker()->get_pending_token_request_count());
-
-  IssueAccessToken(kAccountId2);
+  // Failed token is not retried any more. Account marked as removed.
+  EXPECT_EQ(0UL, tracker()->get_pending_token_request_count());
   EXPECT_TRUE(driver()->update_accounts_called());
 
   std::vector<GCMClient::AccountTokenInfo> expected_accounts;
   expected_accounts.push_back(MakeAccountToken(kAccountId1));
-  expected_accounts.push_back(MakeAccountToken(kAccountId2));
   VerifyAccountTokens(expected_accounts, driver()->accounts());
 }
 
 TEST_F(GCMAccountTrackerTest, GetTokenFailedAccountRemoved) {
   SignInAccount(kAccountId1);
   SignInAccount(kAccountId2);
 
   tracker()->Start();
   IssueAccessToken(kAccountId1);
-  IssueError(kAccountId2);
 
   driver()->ResetResults();
   SignOutAccount(kAccountId2);
   IssueError(kAccountId2);
 
   EXPECT_TRUE(driver()->update_accounts_called());
 
   std::vector<GCMClient::AccountTokenInfo> expected_accounts;
   expected_accounts.push_back(MakeAccountToken(kAccountId1));
   VerifyAccountTokens(expected_accounts, driver()->accounts());
@@ skipping 110 matching lines @@
   // but we have the update call.
   SignOutAccount(kAccountId1);
   EXPECT_TRUE(driver()->update_accounts_called());
   EXPECT_FALSE(IsTokenReportingRequired());
 }
 
 // TODO(fgorski): Add test for adding account after removal >> make sure it does
 // not mark removal.
 
 }  // namespace gcm