| Index: net/ftp/ftp_util.cc
 | 
| ===================================================================
 | 
| --- net/ftp/ftp_util.cc	(revision 114929)
 | 
| +++ net/ftp/ftp_util.cc	(working copy)
 | 
| @@ -12,7 +12,6 @@
 | 
|  #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"
 | 
| @@ -22,8 +21,6 @@
 | 
|  #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.
 | 
|  
 | 
| @@ -214,26 +211,26 @@
 | 
|    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(StringPiece16(rest.begin(), rest.begin() + 2),
 | 
| -                             &time_exploded.hour)) {
 | 
| +      if (!base::StringToInt(rest.begin(),
 | 
| +                             rest.begin() + 2,
 | 
| +                             &time_exploded.hour))
 | 
|          return false;
 | 
| -      }
 | 
|  
 | 
| -      if (!base::StringToInt(StringPiece16(rest.begin() + 3, rest.begin() + 5),
 | 
| -                             &time_exploded.minute)) {
 | 
| +      if (!base::StringToInt(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(StringPiece16(rest.begin(), rest.begin() + 1),
 | 
| -                             &time_exploded.hour)) {
 | 
| +      if (!base::StringToInt(rest.begin(),
 | 
| +                             rest.begin() + 1,
 | 
| +                             &time_exploded.hour))
 | 
|          return false;
 | 
| -      }
 | 
|  
 | 
| -      if (!base::StringToInt(StringPiece16(rest.begin() + 2, rest.begin() + 4),
 | 
| -                             &time_exploded.minute)) {
 | 
| +      if (!base::StringToInt(rest.begin() + 2,
 | 
| +                             rest.begin() + 4,
 | 
| +                             &time_exploded.minute))
 | 
|          return false;
 | 
| -      }
 | 
|      } else {
 | 
|        return false;
 | 
|      }
 | 
| 
 |