3 files changed, 9 insertions, 1 deletions
diff --git a/google_apis/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth_client.cc
index 08bc7a2..cd04325 100644
--- a/google_apis/gaia/gaia_oauth_client.cc
+++ b/google_apis/gaia/gaia_oauth_client.cc
@@ -74,7 +74,9 @@ void GaiaOAuthClient::Core::GetTokensFromAuthCode(
                                                 true) +
       "&client_secret=" +
       net::EscapeUrlEncodedData(oauth_client_info.client_secret, true) +
-      "&redirect_uri=oob&grant_type=authorization_code";
+      "&redirect_uri=" +
+      net::EscapeUrlEncodedData(oauth_client_info.redirect_uri, true) +
+      "&grant_type=authorization_code";
   MakeGaiaRequest(post_body, max_retries, delegate);
 }
 
diff --git a/google_apis/gaia/gaia_oauth_client.h b/google_apis/gaia/gaia_oauth_client.h
index fff51cf..3dad639 100644
--- a/google_apis/gaia/gaia_oauth_client.h
+++ b/google_apis/gaia/gaia_oauth_client.h
@@ -23,6 +23,7 @@ static const char kGaiaOAuth2Url[] =
 struct OAuthClientInfo {
   std::string client_id;
   std::string client_secret;
+  std::string redirect_uri;
 };
 
 class GaiaOAuthClient {
diff --git a/google_apis/gaia/gaia_oauth_client_unittest.cc b/google_apis/gaia/gaia_oauth_client_unittest.cc
index 4991817..739898d 100644
--- a/google_apis/gaia/gaia_oauth_client_unittest.cc
+++ b/google_apis/gaia/gaia_oauth_client_unittest.cc
@@ -156,6 +156,7 @@ TEST_F(GaiaOAuthClientTest, NetworkFailure) {
   OAuthClientInfo client_info;
   client_info.client_id = "test_client_id";
   client_info.client_secret = "test_client_secret";
+  client_info.redirect_uri = "test_redirect_uri";
   GaiaOAuthClient auth(kGaiaOAuth2Url,
                        profile_.GetRequestContext());
   auth.GetTokensFromAuthCode(client_info, "auth_code", 2, &delegate);
@@ -178,6 +179,7 @@ TEST_F(GaiaOAuthClientTest, NetworkFailureRecover) {
   OAuthClientInfo client_info;
   client_info.client_id = "test_client_id";
   client_info.client_secret = "test_client_secret";
+  client_info.redirect_uri = "test_redirect_uri";
   GaiaOAuthClient auth(kGaiaOAuth2Url,
                        profile_.GetRequestContext());
   auth.GetTokensFromAuthCode(client_info, "auth_code", -1, &delegate);
@@ -199,6 +201,7 @@ TEST_F(GaiaOAuthClientTest, OAuthFailure) {
   OAuthClientInfo client_info;
   client_info.client_id = "test_client_id";
   client_info.client_secret = "test_client_secret";
+  client_info.redirect_uri = "test_redirect_uri";
   GaiaOAuthClient auth(kGaiaOAuth2Url,
                        profile_.GetRequestContext());
   auth.GetTokensFromAuthCode(client_info, "auth_code", -1, &delegate);
@@ -218,6 +221,7 @@ TEST_F(GaiaOAuthClientTest, GetTokensSuccess) {
   OAuthClientInfo client_info;
   client_info.client_id = "test_client_id";
   client_info.client_secret = "test_client_secret";
+  client_info.redirect_uri = "test_redirect_uri";
   GaiaOAuthClient auth(kGaiaOAuth2Url,
                        profile_.GetRequestContext());
   auth.GetTokensFromAuthCode(client_info, "auth_code", -1, &delegate);
@@ -236,6 +240,7 @@ TEST_F(GaiaOAuthClientTest, RefreshTokenSuccess) {
   OAuthClientInfo client_info;
   client_info.client_id = "test_client_id";
   client_info.client_secret = "test_client_secret";
+  client_info.redirect_uri = "test_redirect_uri";
   GaiaOAuthClient auth(kGaiaOAuth2Url,
                        profile_.GetRequestContext());
   auth.GetTokensFromAuthCode(client_info, "auth_code", -1, &delegate);