Index: net/ftp/ftp_util.cc |
diff --git a/net/ftp/ftp_util.cc b/net/ftp/ftp_util.cc |
index 553d513f52752d26946fadd357ffa2f9a02a78e5..f6bdf2f83db9de6946abef3e940b0ec81c3a6c84 100644 |
--- a/net/ftp/ftp_util.cc |
+++ b/net/ftp/ftp_util.cc |
@@ -12,6 +12,7 @@ |
#include "base/logging.h" |
#include "base/memory/singleton.h" |
#include "base/string_number_conversions.h" |
+#include "base/string_piece.h" |
#include "base/string_split.h" |
#include "base/string_tokenizer.h" |
#include "base/string_util.h" |
@@ -21,6 +22,8 @@ |
#include "unicode/dtfmtsym.h" |
#include "unicode/uchar.h" |
+using base::StringPiece16; |
+ |
// For examples of Unix<->VMS path conversions, see the unit test file. On VMS |
// a path looks differently depending on whether it's a file or directory. |
@@ -211,26 +214,26 @@ bool FtpUtil::LsDateListingToTime(const string16& month, const string16& day, |
if (!base::StringToInt(rest, &time_exploded.year)) { |
// Maybe it's time. Does it look like time (HH:MM)? |
if (rest.length() == 5 && rest[2] == ':') { |
- if (!base::StringToInt(rest.begin(), |
- rest.begin() + 2, |
- &time_exploded.hour)) |
+ if (!base::StringToInt(StringPiece16(rest.begin(), rest.begin() + 2), |
+ &time_exploded.hour)) { |
return false; |
+ } |
- if (!base::StringToInt(rest.begin() + 3, |
- rest.begin() + 5, |
- &time_exploded.minute)) |
+ if (!base::StringToInt(StringPiece16(rest.begin() + 3, rest.begin() + 5), |
+ &time_exploded.minute)) { |
return false; |
+ } |
} else if (rest.length() == 4 && rest[1] == ':') { |
// Sometimes it's just H:MM. |
- if (!base::StringToInt(rest.begin(), |
- rest.begin() + 1, |
- &time_exploded.hour)) |
+ if (!base::StringToInt(StringPiece16(rest.begin(), rest.begin() + 1), |
+ &time_exploded.hour)) { |
return false; |
+ } |
- if (!base::StringToInt(rest.begin() + 2, |
- rest.begin() + 4, |
- &time_exploded.minute)) |
+ if (!base::StringToInt(StringPiece16(rest.begin() + 2, rest.begin() + 4), |
+ &time_exploded.minute)) { |
return false; |
+ } |
} else { |
return false; |
} |