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

chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc

Index: chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc
diff --git a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc b/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc
index 75608a6ae3260804f662a93ae64b9bcc266f3c55..0f179b27f7804bc9b1698d92243ebfb86061acdd 100644
--- a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc
+++ b/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc
@@ -75,9 +75,10 @@ class MockOAuth2TokenService : public OAuth2TokenService {
  private:
   // OAuth2TokenService overrides:
   virtual scoped_ptr<OAuth2TokenService::Request> StartRequest(
-     const OAuth2TokenService::ScopeSet& scopes,
+      const std::string& account_id,
+      const OAuth2TokenService::ScopeSet& scopes,
       OAuth2TokenService::Consumer* consumer) OVERRIDE;
-  virtual std::string GetRefreshToken() OVERRIDE;
+  virtual std::string GetRefreshToken(const std::string& account_id) OVERRIDE;
   virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE {
     return NULL;
   }
@@ -123,6 +124,7 @@ void MockOAuth2TokenService::ClearRequest(
 }
 
 scoped_ptr<OAuth2TokenService::Request> MockOAuth2TokenService::StartRequest(
+      const std::string& account_id,
     const OAuth2TokenService::ScopeSet& scopes,
     OAuth2TokenService::Consumer* consumer) {
   scoped_ptr<Request> request(new Request(scopes, consumer, this));
@@ -130,7 +132,8 @@ scoped_ptr<OAuth2TokenService::Request> MockOAuth2TokenService::StartRequest(
   return request.PassAs<OAuth2TokenService::Request>();
 }
 
-std::string MockOAuth2TokenService::GetRefreshToken() {
+std::string MockOAuth2TokenService::GetRefreshToken(
+    const std::string& account_id) {
   NOTREACHED();
   return std::string();
 }
@@ -206,7 +209,8 @@ class ManagedUserRefreshTokenFetcherTest : public testing::Test {
 ManagedUserRefreshTokenFetcherTest::ManagedUserRefreshTokenFetcherTest()
     : token_fetcher_(
           ManagedUserRefreshTokenFetcher::Create(&oauth2_token_service_,
-                                          profile_.GetRequestContext())),
+                                                 std::string(),
+                                                 profile_.GetRequestContext())),
       error_(GoogleServiceAuthError::NONE),
       weak_ptr_factory_(this) {}