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

chrome/common/net/gaia/gaia_authenticator.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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_authenticator.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 139 matching lines @@
 
   return PerformGaiaRequest(params, results);
 }
 
 bool GaiaAuthenticator::PerformGaiaRequest(const AuthParams& params,
                                            AuthResults* results) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   GURL gaia_auth_url(gaia_url_);
 
   string post_body;
-  post_body += "Email=" + EscapeUrlEncodedData(params.email, true);
-  post_body += "&Passwd=" + EscapeUrlEncodedData(params.password, true);
-  post_body += "&source=" + EscapeUrlEncodedData(user_agent_, true);
+  post_body += "Email=" + EscapeUrlEncodedData(params.email);
+  post_body += "&Passwd=" + EscapeUrlEncodedData(params.password);
+  post_body += "&source=" + EscapeUrlEncodedData(user_agent_);
   post_body += "&service=" + service_id_;
   if (!params.captcha_token.empty() && !params.captcha_value.empty()) {
-    post_body += "&logintoken=" +
-                 EscapeUrlEncodedData(params.captcha_token, true);
-    post_body += "&logincaptcha=" +
-                 EscapeUrlEncodedData(params.captcha_value, true);
+    post_body += "&logintoken=" + EscapeUrlEncodedData(params.captcha_token);
+    post_body += "&logincaptcha=" + EscapeUrlEncodedData(params.captcha_value);
   }
   post_body += "&PersistentCookie=true";
   // We set it to GOOGLE (and not HOSTED or HOSTED_OR_GOOGLE) because we only
   // allow consumer logins.
   post_body += "&accountType=GOOGLE";
 
   string message_text;
   unsigned long server_response_code;
   if (!Post(gaia_auth_url, post_body, &server_response_code, &message_text)) {
     results->auth_error = ConnectionUnavailable;
@@ skipping 30 matching lines @@
   // Use the provided Gaia server, but change the path to what V1 expects.
   GURL url(gaia_url_);  // Gaia server.
   GURL::Replacements repl;
   // Needs to stay in scope till GURL is out of scope.
   string path(kGetUserInfoPath);
   repl.SetPathStr(path);
   url = url.ReplaceComponents(repl);
 
   string post_body;
   post_body += "LSID=";
-  post_body += EscapeUrlEncodedData(results->lsid, true);
+  post_body += EscapeUrlEncodedData(results->lsid);
 
   unsigned long server_response_code;
   string message_text;
   if (!Post(url, post_body, &server_response_code, &message_text)) {
     return false;
   }
 
   // Check if we received a valid AuthToken; if not, ignore it.
   if (RC_FORBIDDEN == server_response_code) {
     // Server says we're not authenticated.
@@ skipping 29 matching lines @@
   // Use the provided Gaia server, but change the path to what V1 expects.
   GURL url(gaia_url_);  // Gaia server.
   GURL::Replacements repl;
   // Needs to stay in scope till GURL is out of scope.
   string path(kGaiaV1IssueAuthTokenPath);
   repl.SetPathStr(path);
   url = url.ReplaceComponents(repl);
 
   string post_body;
   post_body += "LSID=";
-  post_body += EscapeUrlEncodedData(results->lsid, true);
+  post_body += EscapeUrlEncodedData(results->lsid);
   post_body += "&service=" + service_id;
   post_body += "&Session=true";
 
   unsigned long server_response_code;
   string message_text;
   if (!Post(url, post_body, &server_response_code, &message_text)) {
     return false;
   }
 
   // Check if we received a valid AuthToken; if not, ignore it.
@@ skipping 109 matching lines @@
 bool GaiaAuthenticator::Authenticate(const string& user_name,
                                      const string& password) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   const string empty;
   return Authenticate(user_name, password, empty,
                       empty);
 }
 
 }  // namepace gaia