Make OAuth2TokenService::Request class multi-login aware.

google_apis/gaia/oauth2_token_service.h

 // Copyright 2013 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 GOOGLE_APIS_GAIA_OAUTH2_TOKEN_SERVICE_H_
 #define GOOGLE_APIS_GAIA_OAUTH2_TOKEN_SERVICE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 38 matching lines @@
 //   results.
 //
 // The caller of StartRequest() owns the returned request and is responsible to
 // delete the request even once the callback has been invoked.
 class OAuth2TokenService : public base::NonThreadSafe {
  public:
   // Class representing a request that fetches an OAuth2 access token.
   class Request {
    public:
     virtual ~Request();
+    virtual std::string GetAccountId() const = 0;

[Andrew T Wilson (Slow), 2013/11/05 09:28:48]

Why is this necessary? Nobody calls this, and it seems like a pollution of the
public API for Request (Request is just supposed to be an opaque class that has
nothing but a destructor).

    protected:
     Request();
   };
 
   // Class representing the consumer of a Request passed to |StartRequest|,
   // which will be called back when the request completes.
   class Consumer {
    public:
     Consumer();
     virtual ~Consumer();
@@ skipping 101 matching lines @@
 
  protected:
   // Implements a cancelable |OAuth2TokenService::Request|, which should be
   // operated on the UI thread.
   // TODO(davidroche): move this out of header file.
   class RequestImpl : public base::SupportsWeakPtr<RequestImpl>,
                       public base::NonThreadSafe,
                       public Request {
    public:
     // |consumer| is required to outlive this.
-    explicit RequestImpl(Consumer* consumer);
+    explicit RequestImpl(const std::string& account_id, Consumer* consumer);
     virtual ~RequestImpl();
 
+    // Overridden from Request:
+    virtual std::string GetAccountId() const OVERRIDE;
+
     // Informs |consumer_| that this request is completed.
     void InformConsumer(const GoogleServiceAuthError& error,
                         const std::string& access_token,
                         const base::Time& expiration_date);
 
    private:
     // |consumer_| to call back when this request completes.
+    const std::string account_id_;
     Consumer* const consumer_;
   };
 
   // Subclasses should return the maintained refresh token for |account_id|.
   // If no token is available, return an empty string.
   virtual std::string GetRefreshToken(const std::string& account_id) = 0;
 
   // Subclasses can override if they want to report errors to the user.
   virtual void UpdateAuthError(
       const std::string& account_id,
@@ skipping 23 matching lines @@
   void CancelRequestsForAccount(const std::string& account_id);
 
   // Called by subclasses to notify observers.
   virtual void FireRefreshTokenAvailable(const std::string& account_id);
   virtual void FireRefreshTokenRevoked(const std::string& account_id);
   virtual void FireRefreshTokensLoaded();
 
   // Creates a request implementation. Can be overriden by derived classes to
   // provide additional control of token consumption. |consumer| will outlive
   // the created request.
-  virtual scoped_ptr<RequestImpl> CreateRequest(Consumer* consumer);
+  virtual scoped_ptr<RequestImpl> CreateRequest(
+      const std::string& account_id,
+      Consumer* consumer);
 
   // Fetches an OAuth token for the specified client/scopes. Virtual so it can
   // be overridden for tests and for platform-specific behavior on Android.
   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);
 
@@ skipping 91 matching lines @@
   static int max_fetch_retry_num_;
 
   FRIEND_TEST_ALL_PREFIXES(OAuth2TokenServiceTest, RequestParametersOrderTest);
   FRIEND_TEST_ALL_PREFIXES(OAuth2TokenServiceTest,
                            SameScopesRequestedForDifferentClients);
 
   DISALLOW_COPY_AND_ASSIGN(OAuth2TokenService);
 };
 
 #endif  // GOOGLE_APIS_GAIA_OAUTH2_TOKEN_SERVICE_H_