Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5002)

Unified Diff: chrome/common/net/gaia/gaia_auth_fetcher.cc

Issue 7057053: Escaping file names correctly. Also fixed a crush in chromeos debug build while saving a web page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed default arg. Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/net/gaia/gaia_auth_fetcher.cc
diff --git a/chrome/common/net/gaia/gaia_auth_fetcher.cc b/chrome/common/net/gaia/gaia_auth_fetcher.cc
index c8d5311e66f2a39e1e109b67b783a93d16141f2e..9493d0beb2baec0d452c09b0b9e9a7dd5b649c3b 100644
--- a/chrome/common/net/gaia/gaia_auth_fetcher.cc
+++ b/chrome/common/net/gaia/gaia_auth_fetcher.cc
@@ -143,10 +143,10 @@ std::string GaiaAuthFetcher::MakeClientLoginBody(
const std::string& login_token,
const std::string& login_captcha,
HostedAccountsSetting allow_hosted_accounts) {
- std::string encoded_username = EscapeUrlEncodedData(username);
- std::string encoded_password = EscapeUrlEncodedData(password);
- std::string encoded_login_token = EscapeUrlEncodedData(login_token);
- std::string encoded_login_captcha = EscapeUrlEncodedData(login_captcha);
+ std::string encoded_username = EscapeUrlEncodedData(username, true);
+ std::string encoded_password = EscapeUrlEncodedData(password, true);
+ std::string encoded_login_token = EscapeUrlEncodedData(login_token, true);
+ std::string encoded_login_captcha = EscapeUrlEncodedData(login_captcha, true);
const char* account_type = allow_hosted_accounts == HostedAccountsAllowed ?
kAccountTypeHostedOrGoogle :
@@ -179,8 +179,8 @@ std::string GaiaAuthFetcher::MakeIssueAuthTokenBody(
const std::string& sid,
const std::string& lsid,
const char* const service) {
- std::string encoded_sid = EscapeUrlEncodedData(sid);
- std::string encoded_lsid = EscapeUrlEncodedData(lsid);
+ std::string encoded_sid = EscapeUrlEncodedData(sid, true);
+ std::string encoded_lsid = EscapeUrlEncodedData(lsid, true);
// All tokens should be session tokens except the gaia auth token.
bool session = true;
@@ -196,7 +196,7 @@ std::string GaiaAuthFetcher::MakeIssueAuthTokenBody(
// static
std::string GaiaAuthFetcher::MakeGetUserInfoBody(const std::string& lsid) {
- std::string encoded_lsid = EscapeUrlEncodedData(lsid);
+ std::string encoded_lsid = EscapeUrlEncodedData(lsid, true);
return base::StringPrintf(kGetUserInfoFormat, encoded_lsid.c_str());
}

Powered by Google App Engine
This is Rietveld 408576698