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

net/base/escape.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 "net/base/escape.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
@@ skipping 194 matching lines @@
 std::string EscapePath(const std::string& path) {
   return Escape(path, kPathCharmap, false);
 }
 
 // non-printable, non-7bit, and (including space) ?>=<;+'&%$#"![\]^`{|}
 static const Charmap kUrlEscape(
   0xffffffffL, 0xf80008fdL, 0x78000001L, 0xb8000001L,
   0xffffffffL, 0xffffffffL, 0xffffffffL, 0xffffffffL
 );
 
-std::string EscapeUrlEncodedData(const std::string& path,
-                                 bool use_plus) {
-  return Escape(path, kUrlEscape, use_plus);
+std::string EscapeUrlEncodedData(const std::string& path) {
+  return Escape(path, kUrlEscape, true);
 }
 
 // non-7bit
 static const Charmap kNonASCIICharmap(
   0x00000000L, 0x00000000L, 0x00000000L, 0x00000000L,
   0xffffffffL, 0xffffffffL, 0xffffffffL, 0xffffffffL);
 
 std::string EscapeNonASCII(const std::string& input) {
   return Escape(input, kNonASCIICharmap, false);
 }
@@ skipping 152 matching lines @@
       return;
     }
     if (offset <= (location + 2)) {
       offset = string16::npos;
       return;
     }
     adjusted_offset -= 2;
   }
   offset = adjusted_offset;
 }