Identity API: add multi-account support to token cache and request queues

chrome/browser/extensions/api/identity/identity_api.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_IDENTITY_IDENTITY_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_IDENTITY_IDENTITY_API_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/extensions/api/identity/account_tracker.h"
+#include "chrome/browser/extensions/api/identity/extension_token_key.h"
 #include "chrome/browser/extensions/api/identity/gaia_web_auth_flow.h"
 #include "chrome/browser/extensions/api/identity/identity_mint_queue.h"
 #include "chrome/browser/extensions/api/identity/identity_signin_flow.h"
 #include "chrome/browser/extensions/api/identity/web_auth_flow.h"
 #include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "chrome/browser/signin/signin_global_error.h"
 #include "google_apis/gaia/oauth2_mint_token_flow.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 
@@ skipping 135 matching lines @@
   std::string MapOAuth2ErrorToDescription(const std::string& error);
 
   std::string GetOAuth2ClientId() const;
 
   bool should_prompt_for_scopes_;
   IdentityMintRequestQueue::MintType mint_token_flow_type_;
   scoped_ptr<OAuth2MintTokenFlow> mint_token_flow_;
   OAuth2MintTokenFlow::Mode gaia_mint_token_mode_;
   bool should_prompt_for_signin_;
 
+  scoped_ptr<ExtensionTokenKey> token_key_;
   std::string oauth2_client_id_;
   // When launched in interactive mode, and if there is no existing grant,
   // a permissions prompt will be popped up to the user.
   IssueAdviceInfo issue_advice_;
   scoped_ptr<GaiaWebAuthFlow> gaia_web_auth_flow_;
   scoped_ptr<IdentitySigninFlow> signin_flow_;
   scoped_ptr<OAuth2TokenService::Request> login_token_request_;
 };
 
 class IdentityRemoveCachedAuthTokenFunction
@@ skipping 63 matching lines @@
 
   CacheValueStatus status_;
   IssueAdviceInfo issue_advice_;
   std::string token_;
   base::Time expiration_time_;
 };
 
 class IdentityAPI : public ProfileKeyedAPI,
                     public AccountTracker::Observer {
  public:
-  struct TokenCacheKey {
-    TokenCacheKey(const std::string& extension_id,
-                  const std::set<std::string> scopes);
-    ~TokenCacheKey();
-    bool operator<(const TokenCacheKey& rhs) const;
-    std::string extension_id;
-    std::set<std::string> scopes;
-  };
-
-  typedef std::map<TokenCacheKey, IdentityTokenCacheValue> CachedTokens;
+  typedef std::map<ExtensionTokenKey, IdentityTokenCacheValue> CachedTokens;
 
   explicit IdentityAPI(Profile* profile);
   virtual ~IdentityAPI();
 
   // Request serialization queue for getAuthToken.
   IdentityMintRequestQueue* mint_queue();
 
   // Token cache
-  void SetCachedToken(const std::string& extension_id,
-                      const std::vector<std::string> scopes,
+  void SetCachedToken(const ExtensionTokenKey& key,
                       const IdentityTokenCacheValue& token_data);
   void EraseCachedToken(const std::string& extension_id,
                         const std::string& token);
   void EraseAllCachedTokens();
-  const IdentityTokenCacheValue& GetCachedToken(
-      const std::string& extension_id, const std::vector<std::string> scopes);
+  const IdentityTokenCacheValue& GetCachedToken(const ExtensionTokenKey& key);
 
   const CachedTokens& GetAllCachedTokens();
 
   void ReportAuthError(const GoogleServiceAuthError& error);
 
   // ProfileKeyedAPI implementation.
   virtual void Shutdown() OVERRIDE;
   static ProfileKeyedAPIFactory<IdentityAPI>* GetFactoryInstance();
 
   // AccountTracker::Observer implementation:
@@ skipping 16 matching lines @@
   CachedTokens token_cache_;
   AccountTracker account_tracker_;
 };
 
 template <>
 void ProfileKeyedAPIFactory<IdentityAPI>::DeclareFactoryDependencies();
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_IDENTITY_IDENTITY_API_H_