diff options
| author | morrita@chromium.org <morrita@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-28 05:34:27 +0000 |
|---|---|---|
| committer | morrita@chromium.org <morrita@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-28 05:34:27 +0000 |
| commit | ce681a8b14c05752f9279e7ed945943506f7d628 (patch) | |
| tree | 0525ceb2c94766bd1344726f14c7528e6c0e8689 /webkit | |
| parent | 60527a34dfeacad59e7eac002ecc5db516c1898f (diff) | |
| download | chromium_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 'webkit')
| -rw-r--r-- | webkit/blob/blob_storage_controller_unittest.cc | 8 | ||||
| -rw-r--r-- | webkit/fileapi/file_system_dir_url_request_job_unittest.cc | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/webkit/blob/blob_storage_controller_unittest.cc b/webkit/blob/blob_storage_controller_unittest.cc index 27beb44..884c18a 100644 --- a/webkit/blob/blob_storage_controller_unittest.cc +++ b/webkit/blob/blob_storage_controller_unittest.cc @@ -18,8 +18,8 @@ namespace webkit_blob { TEST(BlobStorageControllerTest, RegisterBlobUrl) { // Setup a set of blob data for testing. base::Time time1, time2; - base::Time::FromString("Tue, 15 Nov 1994, 12:45:26 GMT", &time1); - base::Time::FromString("Mon, 14 Nov 1994, 11:30:49 GMT", &time2); + base::Time::FromString(L"Tue, 15 Nov 1994, 12:45:26 GMT", &time1); + base::Time::FromString(L"Mon, 14 Nov 1994, 11:30:49 GMT", &time2); scoped_refptr<BlobData> blob_data1(new BlobData()); blob_data1->AppendData("Data1"); @@ -80,8 +80,8 @@ TEST(BlobStorageControllerTest, RegisterBlobUrl) { TEST(BlobStorageControllerTest, ResolveBlobReferencesInUploadData) { // Setup blob data for testing. base::Time time1, time2; - base::Time::FromString("Tue, 15 Nov 1994, 12:45:26 GMT", &time1); - base::Time::FromString("Mon, 14 Nov 1994, 11:30:49 GMT", &time2); + base::Time::FromString(L"Tue, 15 Nov 1994, 12:45:26 GMT", &time1); + base::Time::FromString(L"Mon, 14 Nov 1994, 11:30:49 GMT", &time2); scoped_ptr<BlobStorageController> blob_storage_controller( new BlobStorageController()); diff --git a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc index 738c64d..a40c6a0 100644 --- a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc +++ b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc @@ -196,9 +196,9 @@ class FileSystemDirURLRequestJobTest : public testing::Test { base::Time date; icu::UnicodeString date_ustr(match.group(5, status)); - std::string date_str; - UTF16ToUTF8(date_ustr.getBuffer(), date_ustr.length(), &date_str); - EXPECT_TRUE(base::Time::FromString(date_str.c_str(), &date)); + std::wstring date_wstr; + UTF16ToWide(date_ustr.getBuffer(), date_ustr.length(), &date_wstr); + EXPECT_TRUE(base::Time::FromString(date_wstr.c_str(), &date)); EXPECT_FALSE(date.is_null()); } |