diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-26 19:07:08 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-26 19:07:08 +0000 |
| commit | 916654128e5925ae80ebf38c2a24851b5334b570 (patch) | |
| tree | 46d55299998752d2d7e880da87c3c6f1763661b4 /base/file_util_unittest.cc | |
| parent | 7295a426ac4e6f7f72c3b0730644fc2dd8fd540f (diff) | |
| download | chromium_src-916654128e5925ae80ebf38c2a24851b5334b570.zip chromium_src-916654128e5925ae80ebf38c2a24851b5334b570.tar.gz chromium_src-916654128e5925ae80ebf38c2a24851b5334b570.tar.bz2 | |
Revert r83048 "Removed wchar_t from Time::FromString."
This causes regression on KeywordProviderTest.Edit on clang produced executable.
TBR=shinyak
BUG=
TEST=
Review URL: http://codereview.chromium.org/6893031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83055 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_util_unittest.cc')
| -rw-r--r-- | base/file_util_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc index db9d638..733f9f1 100644 --- a/base/file_util_unittest.cc +++ b/base/file_util_unittest.cc @@ -1779,13 +1779,13 @@ TEST_F(FileUtilTest, TouchFile) { base::Time access_time; // This timestamp is divisible by one day (in local timezone), // to make it work on FAT too. - ASSERT_TRUE(base::Time::FromString("Wed, 16 Nov 1994, 00:00:00", + ASSERT_TRUE(base::Time::FromString(L"Wed, 16 Nov 1994, 00:00:00", &access_time)); base::Time modification_time; // Note that this timestamp is divisible by two (seconds) - FAT stores // modification times with 2s resolution. - 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", &modification_time)); ASSERT_TRUE(file_util::TouchFile(foobar, access_time, modification_time)); |