summaryrefslogtreecommitdiffstats
path: root/net/ftp
diff options
context:
space:
mode:
authorshinyak@google.com <shinyak@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-28 04:53:17 +0000
committershinyak@google.com <shinyak@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-28 04:53:17 +0000
commit60527a34dfeacad59e7eac002ecc5db516c1898f (patch)
tree7b96c3eaa4ae6f40e73637081cf42f69dbc581eb /net/ftp
parent6f5fa9f917396a24ef3b38a6358c15e96d4b6512 (diff)
downloadchromium_src-60527a34dfeacad59e7eac002ecc5db516c1898f.zip
chromium_src-60527a34dfeacad59e7eac002ecc5db516c1898f.tar.gz
chromium_src-60527a34dfeacad59e7eac002ecc5db516c1898f.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94426 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ftp')
-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 4f26817..94c1837 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(L"Tue, 15 Nov 1994 12:45:26 GMT",
+ ASSERT_TRUE(base::Time::FromString("Tue, 15 Nov 1994 12:45:26 GMT",
&mock_current_time));
const struct {