Landing again: "Make FTP directory parser less strict"

The new testfiles added in the CL had a problem. Fixed it now.

This reverts commit 9c484365.

BUG=676762
R=mmenke@chromium.org

Review-Url: https://codereview.chromium.org/2613093003 .
Cr-Commit-Position: refs/heads/master@{#442064}

net/data/ftp/dir-listing-ls-34

+-rw-rw-r--   1 ftpuser  ftpusers    1761280 Dec 20  2002 controle_embarqu_avec_labview_real_time_et_compactfieldpoint.ppt
+-rw-rw-r--   1 ftpuser  ftpusers     329216 Dec 20  2002 optimisez_l'acquisition_de_donnes_sous_labview.ppt

net/data/ftp/dir-listing-ls-34.expected

+-
+controle_embarqu�_avec_labview_real_time_et_compactfieldpoint.ppt
+1761280
+2002
+12
+20
+0
+0
+
+-
+optimisez_l'acquisition_de_donnＦs_sous_labview.ppt
+329216
+2002
+12
+20
+0
+0

net/ftp/ftp_directory_listing_parser.cc

@@ -28,7 +28,7 @@ int FillInRawName(const std::string& encoding,
                   std::vector<FtpDirectoryListingEntry>* entries) {
   for (size_t i = 0; i < entries->size(); i++) {
     if (!base::UTF16ToCodepage(entries->at(i).name, encoding.c_str(),
-                               base::OnStringConversionError::FAIL,
+                               base::OnStringConversionError::SUBSTITUTE,
                                &entries->at(i).raw_name)) {
       return ERR_ENCODING_CONVERSION_FAILED;
     }
@@ -91,7 +91,7 @@ int DecodeAndParse(const std::string& text,
 
   base::string16 converted_text;
   if (base::CodepageToUTF16(text, encoding_name,
-                            base::OnStringConversionError::FAIL,
+                            base::OnStringConversionError::SUBSTITUTE,
                             &converted_text)) {
     const char* const kNewlineSeparators[] = {"\n", "\r\n"};
 

net/ftp/ftp_directory_listing_parser_unittest.cc

@@ -158,6 +158,7 @@ const FtpTestParam kTestParams[] = {
     {"dir-listing-ls-31", OK},
     {"dir-listing-ls-32", OK},  // busybox
     {"dir-listing-ls-33", OK},
+    {"dir-listing-ls-34", OK},  // Broken encoding. Should not fail.
 
     {"dir-listing-netware-1", OK},
     {"dir-listing-netware-2", OK},