summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/blob/blob_storage_controller_unittest.cc8
-rw-r--r--webkit/fileapi/file_system_dir_url_request_job_unittest.cc6
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());
}