diff options
| author | pavely@chromium.org <pavely@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 23:52:03 +0000 |
|---|---|---|
| committer | pavely@chromium.org <pavely@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 23:52:03 +0000 |
| commit | b67c18c667575649126831940f07e3c420d29cfc (patch) | |
| tree | 9003b7db2b0aebc3ef7df5ecf221834ec1393fa6 /google_apis | |
| parent | effc83ba229132cabfa86df3a396b564a573f38c (diff) | |
| download | chromium_src-b67c18c667575649126831940f07e3c420d29cfc.zip chromium_src-b67c18c667575649126831940f07e3c420d29cfc.tar.gz chromium_src-b67c18c667575649126831940f07e3c420d29cfc.tar.bz2 | |
Use OAuth2 token for sync
ProfileSyncService requests access token from OAuth2TokenService and passes it
to ServerConnectionManager through UpdateCredentials. When server returns
AUTH_ERROR it gets propagated to ProfileSyncService through OnGetStatusChange
call. At this point ProfileSyncService needs to invalidate old token with
OAuth2TokenService and request a new one.
Access token is requested in PSS::StartUp since this is the place where all
preconditions are verified. There is a call to pre-request access token in
Initialize and Observe after Login token is loaded.
There are still two tests disabled, I'll fix them and update this CR.
BUG=226464
TBR=jhawkins@chromium.org
Review URL: https://chromiumcodereview.appspot.com/15421011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206224 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis')
| -rw-r--r-- | google_apis/gaia/gaia_constants.cc | 7 | ||||
| -rw-r--r-- | google_apis/gaia/gaia_constants.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/google_apis/gaia/gaia_constants.cc b/google_apis/gaia/gaia_constants.cc index e8a7beb..c4086fe 100644 --- a/google_apis/gaia/gaia_constants.cc +++ b/google_apis/gaia/gaia_constants.cc @@ -32,6 +32,13 @@ const char kDeviceManagementServiceOAuth[] = // OAuth2 scope for access to all Google APIs. const char kAnyApiOAuth2Scope[] = "https://www.googleapis.com/auth/any-api"; +// OAuth2 scope for access to Chrome sync APIs +const char kChromeSyncOAuth2Scope[] = + "https://www.googleapis.com/auth/chromesync"; +// OAuth2 scope for access to Google Talk APIs (XMPP). +const char kGoogleTalkOAuth2Scope[] = + "https://www.googleapis.com/auth/googletalk"; + // Service for LSO endpoint of Google that exposes OAuth APIs. const char kLSOService[] = "lso"; diff --git a/google_apis/gaia/gaia_constants.h b/google_apis/gaia/gaia_constants.h index eba9ce1..0b09b27 100644 --- a/google_apis/gaia/gaia_constants.h +++ b/google_apis/gaia/gaia_constants.h @@ -21,6 +21,8 @@ extern const char kRemotingService[]; extern const char kCloudPrintService[]; extern const char kDeviceManagementServiceOAuth[]; extern const char kAnyApiOAuth2Scope[]; +extern const char kChromeSyncOAuth2Scope[]; +extern const char kGoogleTalkOAuth2Scope[]; extern const char kLSOService[]; // Used with uber auth tokens when needed. |