Revert 88510 - Escaping file names correctly. Also fixed a crush in chromeos debug build while sa...

chrome/common/net/gaia/gaia_auth_fetcher.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/net/gaia/gaia_auth_fetcher.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 125 matching lines @@
 
 // static
 std::string GaiaAuthFetcher::MakeClientLoginBody(
     const std::string& username,
     const std::string& password,
     const std::string& source,
     const char* service,
     const std::string& login_token,
     const std::string& login_captcha,
     HostedAccountsSetting allow_hosted_accounts) {
-  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);
+  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);
 
   const char* account_type = allow_hosted_accounts == HostedAccountsAllowed ?
       kAccountTypeHostedOrGoogle :
       kAccountTypeGoogle;
 
   if (login_token.empty() || login_captcha.empty()) {
     return base::StringPrintf(kClientLoginFormat,
                               encoded_username.c_str(),
                               encoded_password.c_str(),
                               kCookiePersistence,
@@ skipping 12 matching lines @@
                             encoded_login_token.c_str(),
                             encoded_login_captcha.c_str());
 
 }
 
 // static
 std::string GaiaAuthFetcher::MakeIssueAuthTokenBody(
     const std::string& sid,
     const std::string& lsid,
     const char* const service) {
-  std::string encoded_sid = EscapeUrlEncodedData(sid, true);
-  std::string encoded_lsid = EscapeUrlEncodedData(lsid, true);
+  std::string encoded_sid = EscapeUrlEncodedData(sid);
+  std::string encoded_lsid = EscapeUrlEncodedData(lsid);
 
   // All tokens should be session tokens except the gaia auth token.
   bool session = true;
   if (!strcmp(service, GaiaConstants::kGaiaService))
     session = false;
 
   return base::StringPrintf(kIssueAuthTokenFormat,
                             encoded_sid.c_str(),
                             encoded_lsid.c_str(),
                             service,
                             session ? "true" : "false");
 }
 
 // static
 std::string GaiaAuthFetcher::MakeGetUserInfoBody(const std::string& lsid) {
-  std::string encoded_lsid = EscapeUrlEncodedData(lsid, true);
+  std::string encoded_lsid = EscapeUrlEncodedData(lsid);
   return base::StringPrintf(kGetUserInfoFormat, encoded_lsid.c_str());
 }
 
 // Helper method that extracts tokens from a successful reply.
 // static
 void GaiaAuthFetcher::ParseClientLoginResponse(const std::string& data,
                                                   std::string* sid,
                                                   std::string* lsid,
                                                   std::string* token) {
   using std::vector;
@@ skipping 225 matching lines @@
     NOTREACHED();
   }
 }
 
 // static
 bool GaiaAuthFetcher::IsSecondFactorSuccess(
     const std::string& alleged_error) {
   return alleged_error.find(kSecondFactor) !=
       std::string::npos;
 }