summaryrefslogtreecommitdiffstats
path: root/google_apis
diff options
context:
space:
mode:
authorrogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-30 18:32:31 +0000
committerrogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-30 18:32:31 +0000
commit26890b442da49b02820b1ddedd934fba9cfc0eef (patch)
tree007b0d6a0c7572160a009baaa425eddab5d7d08c /google_apis
parent3b60689df06ac0878d710689ae0957e7691a09f1 (diff)
downloadchromium_src-26890b442da49b02820b1ddedd934fba9cfc0eef.zip
chromium_src-26890b442da49b02820b1ddedd934fba9cfc0eef.tar.gz
chromium_src-26890b442da49b02820b1ddedd934fba9cfc0eef.tar.bz2
When using the one-click sign in feature, re-use the oauth2 refesh token
retrieved by the sign in manager instead of having the token service create a new one. BUG=156964 TEST=Use the one-click sign in feature and make sure it works correctly. Try with gmail.com account and with dasher account. Try with accounts that have 2-factor enabled and disabled. There are no user visible changes from this CL. Review URL: https://chromiumcodereview.appspot.com/11290002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164945 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis')
-rw-r--r--google_apis/gaia/gaia_auth_consumer.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/google_apis/gaia/gaia_auth_consumer.cc b/google_apis/gaia/gaia_auth_consumer.cc
index d461bf8..860b66e 100644
--- a/google_apis/gaia/gaia_auth_consumer.cc
+++ b/google_apis/gaia/gaia_auth_consumer.cc
@@ -30,6 +30,9 @@ bool GaiaAuthConsumer::ClientLoginResult::operator==(
two_factor == b.two_factor;
}
+GaiaAuthConsumer::ClientOAuthResult::ClientOAuthResult()
+ : expires_in_secs(0) {}
+
GaiaAuthConsumer::ClientOAuthResult::ClientOAuthResult(
const std::string& new_refresh_token,
const std::string& new_access_token,