Making OAuth2TokenService multi-login aware, updating callers, minor fixes

chrome/browser/signin/ubertoken_fetcher_unittest.cc

 // Copyright (c) 2012 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/signin/ubertoken_fetcher.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/token_service_unittest.h"
@@ skipping 25 matching lines @@
 
   std::string last_token_;
   int nb_correct_token_;
   GoogleServiceAuthError last_error_;
   int nb_error_;
 };
 
 class MockOAuth2TokenService : public ProfileOAuth2TokenService {
   // OAuth2TokenService overrides:
   virtual scoped_ptr<OAuth2TokenService::Request>
-      StartRequest(const OAuth2TokenService::ScopeSet& scopes,
+      StartRequest(const std::string& account_id,
+                   const OAuth2TokenService::ScopeSet& scopes,
                    OAuth2TokenService::Consumer* consumer) OVERRIDE {
     // Don't actually make a request.
     scoped_ptr<OAuth2TokenService::Request> request;
     return request.Pass();
   }
 };
 
 
 BrowserContextKeyedService* Build(content::BrowserContext* profile) {
   MockOAuth2TokenService* token_service = new MockOAuth2TokenService();
@@ skipping 70 matching lines @@
   service()->IssueAuthTokenForTest(GaiaConstants::kGaiaOAuth2LoginRefreshToken,
                                    "refreshToken");
   fetcher_->StartFetchingToken();
   fetcher_->OnGetTokenSuccess(NULL, "accessToken", base::Time());
   fetcher_->OnUberAuthTokenFailure(error);
 
   EXPECT_EQ(1, consumer_.nb_error_);
   EXPECT_EQ(0, consumer_.nb_correct_token_);
   EXPECT_EQ("", consumer_.last_token_);
 }