summaryrefslogtreecommitdiffstats
path: root/net/ftp/ftp_util_unittest.cc
diff options
context:
space:
mode:
authormorrita@chromium.org <morrita@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-28 05:34:27 +0000
committermorrita@chromium.org <morrita@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-28 05:34:27 +0000
commitce681a8b14c05752f9279e7ed945943506f7d628 (patch)
tree0525ceb2c94766bd1344726f14c7528e6c0e8689 /net/ftp/ftp_util_unittest.cc
parent60527a34dfeacad59e7eac002ecc5db516c1898f (diff)
downloadchromium_src-ce681a8b14c05752f9279e7ed945943506f7d628.zip
chromium_src-ce681a8b14c05752f9279e7ed945943506f7d628.tar.gz
chromium_src-ce681a8b14c05752f9279e7ed945943506f7d628.tar.bz2
Revert 94426 - Removed wchat_t from Time::FromString.
Also, some of the test case are moved for pr_time_unittests to time_unitests. BUG=77962 TEST=base_unittests:TimeTest.* Review URL: http://codereview.chromium.org/7470038 TBR=shinyak@google.com Review URL: http://codereview.chromium.org/7520021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94427 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ftp/ftp_util_unittest.cc')
-rw-r--r--net/ftp/ftp_util_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ftp/ftp_util_unittest.cc b/net/ftp/ftp_util_unittest.cc
index 94c1837..4f26817 100644
--- a/net/ftp/ftp_util_unittest.cc
+++ b/net/ftp/ftp_util_unittest.cc
@@ -106,7 +106,7 @@ TEST(FtpUtilTest, VMSPathToUnix) {
TEST(FtpUtilTest, LsDateListingToTime) {
base::Time mock_current_time;
- ASSERT_TRUE(base::Time::FromString("Tue, 15 Nov 1994 12:45:26 GMT",
+ ASSERT_TRUE(base::Time::FromString(L"Tue, 15 Nov 1994 12:45:26 GMT",
&mock_current_time));
const struct {