Allow passing in a list of scopes to the access token fetcher class.

chrome/common/net/gaia/oauth2_access_token_fetcher.h

 // Copyright (c) 2011 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_COMMON_NET_GAIA_OAUTH2_ACCESS_TOKEN_FETCHER_H_
 #define CHROME_COMMON_NET_GAIA_OAUTH2_ACCESS_TOKEN_FETCHER_H_
 #pragma once
 
 #include <string>
 
@@ skipping 25 matching lines @@
 // * Create an instance with a consumer.
 // * Call Start()
 // * The consumer passed in the constructor will be called on the same
 //   thread Start was called with the results.
 //
 // This class can handle one request at a time. To parallelize requests,
 // create multiple instances.
 class OAuth2AccessTokenFetcher : public content::URLFetcherDelegate {
  public:
   OAuth2AccessTokenFetcher(OAuth2AccessTokenConsumer* consumer,
-                           net::URLRequestContextGetter* getter,
-                           const std::string& source);
+                           net::URLRequestContextGetter* getter);
   virtual ~OAuth2AccessTokenFetcher();
 
+  // Starts the flow with the given parameters.
+  // |scopes| can be empty. If it is empty then the access token will have the
+  // same scope as the refresh token. If not empty, then access token will have
+  // the scopes specified. In this case, the access token will successfully be
+  // generated only if refresh token has login scope of a list of scopes that is
+  // a super-set of the specified scopes.
   void Start(const std::string& client_id,
              const std::string& client_secret,
-             const std::string& refresh_token);
+             const std::string& refresh_token,
+             const std::vector<std::string>& scopes);
 
   void CancelRequest();
 
   // Implementation of content::URLFetcherDelegate
   virtual void OnURLFetchComplete(const content::URLFetcher* source) OVERRIDE;
 
  private:
   enum State {
     INITIAL,
     GET_ACCESS_TOKEN_STARTED,
     GET_ACCESS_TOKEN_DONE,
     ERROR_STATE,
   };
 
   // Helper methods for the flow.
   void StartGetAccessToken();
   void EndGetAccessToken(const content::URLFetcher* source);
 
   // Helper mehtods for reporting back results.
   void OnGetTokenSuccess(const std::string& access_token);
   void OnGetTokenFailure(GoogleServiceAuthError error);
 
   // Other helpers.
   static GURL MakeGetAccessTokenUrl();
-  static std::string MakeGetAccessTokenBody(const std::string& client_id,
-                                            const std::string& client_secret,
-                                            const std::string& refresh_token);
+  static std::string MakeGetAccessTokenBody(
+      const std::string& client_id,
+      const std::string& client_secret,
+      const std::string& refresh_token,
+      const std::vector<std::string>& scopes);
   static bool ParseGetAccessTokenResponse(const content::URLFetcher* source,
                                           std::string* access_token);
 
   // State that is set during construction.
   OAuth2AccessTokenConsumer* const consumer_;
   net::URLRequestContextGetter* const getter_;
-  std::string source_;
   State state_;
 
   // While a fetch is in progress.
   scoped_ptr<content::URLFetcher> fetcher_;
   std::string client_id_;
   std::string client_secret_;
   std::string refresh_token_;
+  std::vector<std::string> scopes_;
 
   friend class OAuth2AccessTokenFetcherTest;
   FRIEND_TEST_ALL_PREFIXES(OAuth2AccessTokenFetcherTest,
                            ParseGetAccessTokenResponse);
+  FRIEND_TEST_ALL_PREFIXES(OAuth2AccessTokenFetcherTest,
+                           MakeGetAccessTokenBody);
 
   DISALLOW_COPY_AND_ASSIGN(OAuth2AccessTokenFetcher);
 };
 
 #endif  // CHROME_COMMON_NET_GAIA_OAUTH2_ACCESS_TOKEN_FETCHER_H_