| Index: net/ftp/ftp_directory_listing_parser_os2.cc
|
| diff --git a/net/ftp/ftp_directory_listing_parser_os2.cc b/net/ftp/ftp_directory_listing_parser_os2.cc
|
| index a393d32926037949ef1f7d5c77c6e0dcf31c5e1e..7d0ee62b485f757bc3b52bbd7ad0cff864cdf3b1 100644
|
| --- a/net/ftp/ftp_directory_listing_parser_os2.cc
|
| +++ b/net/ftp/ftp_directory_listing_parser_os2.cc
|
| @@ -9,6 +9,7 @@
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/string_split.h"
|
| #include "base/strings/string_util.h"
|
| +#include "base/strings/utf_string_conversions.h"
|
| #include "base/time/time.h"
|
| #include "net/ftp/ftp_directory_listing_parser.h"
|
| #include "net/ftp/ftp_util.h"
|
| @@ -22,8 +23,9 @@ bool ParseFtpDirectoryListingOS2(
|
| if (lines[i].empty())
|
| continue;
|
|
|
| - std::vector<base::string16> columns;
|
| - base::SplitString(base::CollapseWhitespace(lines[i], false), ' ', &columns);
|
| + std::vector<base::string16> columns = base::SplitString(
|
| + base::CollapseWhitespace(lines[i], false), base::ASCIIToUTF16(" "),
|
| + base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
|
|
|
| // Every line of the listing consists of the following:
|
| //
|
|
|