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

chrome/common/net/gaia/oauth2_access_token_fetcher_unittest.cc

Index: chrome/common/net/gaia/oauth2_access_token_fetcher_unittest.cc
===================================================================
--- chrome/common/net/gaia/oauth2_access_token_fetcher_unittest.cc	(revision 111883)
+++ chrome/common/net/gaia/oauth2_access_token_fetcher_unittest.cc	(working copy)
@@ -35,6 +35,8 @@
 using testing::Return;
 
 namespace {
+typedef std::vector<std::string> ScopeList;
+
 static const char kValidTokenResponse[] =
     "{"
     "  \"access_token\": \"at1\","
@@ -114,14 +116,14 @@
 TEST_F(OAuth2AccessTokenFetcherTest, GetAccessTokenRequestFailure) {
   TestURLFetcher* url_fetcher = SetupGetAccessToken(false, 0, "");
   EXPECT_CALL(consumer_, OnGetTokenFailure(_)).Times(1);
-  fetcher_.Start("client_id", "client_secret", "refresh_token");
+  fetcher_.Start("client_id", "client_secret", "refresh_token", ScopeList());
   fetcher_.OnURLFetchComplete(url_fetcher);
 }
 
 TEST_F(OAuth2AccessTokenFetcherTest, GetAccessTokenResponseCodeFailure) {
   TestURLFetcher* url_fetcher = SetupGetAccessToken(true, RC_FORBIDDEN, "");
   EXPECT_CALL(consumer_, OnGetTokenFailure(_)).Times(1);
-  fetcher_.Start("client_id", "client_secret", "refresh_token");
+  fetcher_.Start("client_id", "client_secret", "refresh_token", ScopeList());
   fetcher_.OnURLFetchComplete(url_fetcher);
 }
 
@@ -129,10 +131,52 @@
   TestURLFetcher* url_fetcher = SetupGetAccessToken(
       true, RC_REQUEST_OK, kValidTokenResponse);
   EXPECT_CALL(consumer_, OnGetTokenSuccess("at1")).Times(1);
-  fetcher_.Start("client_id", "client_secret", "refresh_token");
+  fetcher_.Start("client_id", "client_secret", "refresh_token", ScopeList());
   fetcher_.OnURLFetchComplete(url_fetcher);
 }
 
+TEST_F(OAuth2AccessTokenFetcherTest, MakeGetAccessTokenBody) {
+  {  // No scope.
+    std::string body =
+        "client_id=cid1&"
+        "client_secret=cs1&"
+        "grant_type=refresh_token&"
+        "refresh_token=rt1";
+    EXPECT_EQ(body, OAuth2AccessTokenFetcher::MakeGetAccessTokenBody(
+        "cid1", "cs1", "rt1", ScopeList()));
+  }
+
+  {  // One scope.
+    std::string body =
+        "client_id=cid1&"
+        "client_secret=cs1&"
+        "grant_type=refresh_token&"
+        "refresh_token=rt1&"
+        "scope=https://www.googleapis.com/foo";
+    ScopeList scopes;
+    scopes.push_back("https://www.googleapis.com/foo");
+    EXPECT_EQ(body, OAuth2AccessTokenFetcher::MakeGetAccessTokenBody(
+        "cid1", "cs1", "rt1", scopes));
+  }
+
+  {  // Multiple scopes.
+    std::string body =
+        "client_id=cid1&"
+        "client_secret=cs1&"
+        "grant_type=refresh_token&"
+        "refresh_token=rt1&"
+        "scope=https://www.googleapis.com/foo,"
+        "https://www.googleapis.com/bar,"
+        "https://www.googleapis.com/baz";
+    ScopeList scopes;
+    scopes.push_back("https://www.googleapis.com/foo");
+    scopes.push_back("https://www.googleapis.com/bar");
+    scopes.push_back("https://www.googleapis.com/baz");
+    EXPECT_EQ(body, OAuth2AccessTokenFetcher::MakeGetAccessTokenBody(
+        "cid1", "cs1", "rt1", scopes));
+  }
+}
+
 TEST_F(OAuth2AccessTokenFetcherTest, ParseGetAccessTokenResponse) {
   {  // No body.
     TestURLFetcher url_fetcher(0, GURL("www.google.com"), NULL);