| Index: google_apis/gaia/gaia_auth_fetcher.cc
|
| diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc
|
| index f0e26445a52d6e6b94421972d450d6a6d2534ad4..b2116640e7d21faf3b270e7fe2d080b1c73b02e7 100644
|
| --- a/google_apis/gaia/gaia_auth_fetcher.cc
|
| +++ b/google_apis/gaia/gaia_auth_fetcher.cc
|
| @@ -219,8 +219,8 @@ net::URLFetcher* GaiaAuthFetcher::CreateGaiaFetcher(
|
| // The Gaia token exchange requests do not require any cookie-based
|
| // identification as part of requests. We suppress sending any cookies to
|
| // maintain a separation between the user's browsing and Chrome's internal
|
| - // services. Where such mixing is desired (MergeSession), it will be done
|
| - // explicitly.
|
| + // services. Where such mixing is desired (MergeSession or OAuthLogin), it
|
| + // will be done explicitly.
|
| to_return->SetLoadFlags(load_flags);
|
|
|
| // Fetchers are sometimes cancelled because a network change was detected,
|
| @@ -636,7 +636,7 @@ void GaiaAuthFetcher::StartTokenFetchForUberAuthExchange(
|
| std::string(),
|
| authentication_header,
|
| uberauth_token_gurl_,
|
| - kLoadFlagsIgnoreCookies,
|
| + net::LOAD_NORMAL,
|
| this));
|
| fetch_pending_ = true;
|
| fetcher_->Start();
|
| @@ -653,7 +653,7 @@ void GaiaAuthFetcher::StartOAuthLogin(const std::string& access_token,
|
| request_body_,
|
| authentication_header,
|
| oauth_login_gurl_,
|
| - kLoadFlagsIgnoreCookies,
|
| + net::LOAD_NORMAL,
|
| this));
|
| fetch_pending_ = true;
|
| fetcher_->Start();
|
|
|