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

chrome/browser/signin/fake_profile_oauth2_token_service.h

Index: chrome/browser/signin/fake_profile_oauth2_token_service.h
diff --git a/chrome/browser/signin/fake_profile_oauth2_token_service.h b/chrome/browser/signin/fake_profile_oauth2_token_service.h
index cd5bc8b493e4e77ea65c31e015090e0a8709ef36..76ab3909363dd2f28f7a1ba7c7ae10a76751e77c 100644
--- a/chrome/browser/signin/fake_profile_oauth2_token_service.h
+++ b/chrome/browser/signin/fake_profile_oauth2_token_service.h
@@ -43,6 +43,7 @@ class FakeProfileOAuth2TokenService : public ProfileOAuth2TokenService {
     PendingRequest();
     ~PendingRequest();
 
+    std::string account_id;
     std::string client_id;
     std::string client_secret;
     ScopeSet scopes;
@@ -62,6 +63,7 @@ class FakeProfileOAuth2TokenService : public ProfileOAuth2TokenService {
   std::vector<PendingRequest> GetPendingRequests();
 
   // Helper routines to issue tokens for pending requests.
+  // TODO(fgorski): Add account IDs as parameters.
   void IssueTokenForScope(const ScopeSet& scopes,
                           const std::string& access_token,
                           const base::Time& expiration);
@@ -74,6 +76,7 @@ class FakeProfileOAuth2TokenService : public ProfileOAuth2TokenService {
 
   void IssueErrorForAllPendingRequests(const GoogleServiceAuthError& error);
 
+  virtual void Initialize(Profile* profile) OVERRIDE;
   virtual void Shutdown() OVERRIDE;
 
   // Helper function to be used with
@@ -83,12 +86,13 @@ class FakeProfileOAuth2TokenService : public ProfileOAuth2TokenService {
  protected:
   // OAuth2TokenService overrides.
   virtual void FetchOAuth2Token(RequestImpl* request,
+                                const std::string& account_id,
                                 net::URLRequestContextGetter* getter,
                                 const std::string& client_id,
                                 const std::string& client_secret,
                                 const ScopeSet& scopes) OVERRIDE;
 
-  virtual std::string GetRefreshToken() OVERRIDE;
+  virtual std::string GetRefreshToken(const std::string& account_id) OVERRIDE;
 
   virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
 
@@ -104,6 +108,7 @@ class FakeProfileOAuth2TokenService : public ProfileOAuth2TokenService {
 
   std::vector<PendingRequest> pending_requests_;
   std::string refresh_token_;
+  bool is_initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeProfileOAuth2TokenService);
 };