diff options
Diffstat (limited to 'webkit/browser')
| -rw-r--r-- | webkit/browser/blob/local_file_stream_reader_unittest.cc | 6 | ||||
| -rw-r--r-- | webkit/browser/database/database_tracker_unittest.cc | 16 | ||||
| -rw-r--r-- | webkit/browser/fileapi/native_file_util.cc | 5 |
3 files changed, 13 insertions, 14 deletions
diff --git a/webkit/browser/blob/local_file_stream_reader_unittest.cc b/webkit/browser/blob/local_file_stream_reader_unittest.cc index ef7fb60..87c77fc 100644 --- a/webkit/browser/blob/local_file_stream_reader_unittest.cc +++ b/webkit/browser/blob/local_file_stream_reader_unittest.cc @@ -94,9 +94,9 @@ class LocalFileStreamReaderTest : public testing::Test { void TouchTestFile() { base::Time new_modified_time = test_file_modification_time() - base::TimeDelta::FromSeconds(1); - ASSERT_TRUE(file_util::TouchFile(test_path(), - test_file_modification_time(), - new_modified_time)); + ASSERT_TRUE(base::TouchFile(test_path(), + test_file_modification_time(), + new_modified_time)); } base::MessageLoopProxy* file_task_runner() const { diff --git a/webkit/browser/database/database_tracker_unittest.cc b/webkit/browser/database/database_tracker_unittest.cc index 8c3bc0d..bb931d4 100644 --- a/webkit/browser/database/database_tracker_unittest.cc +++ b/webkit/browser/database/database_tracker_unittest.cc @@ -273,14 +273,14 @@ class DatabaseTracker_TestHelper_Test { // Setup file modification times. db1 and db2 are modified now, db3 three // days ago. - EXPECT_TRUE(file_util::SetLastModifiedTime( - tracker->GetFullDBFilePath(kOrigin1, kDB1), base::Time::Now())); - EXPECT_TRUE(file_util::SetLastModifiedTime( - tracker->GetFullDBFilePath(kOrigin2, kDB2), base::Time::Now())); - base::Time three_days_ago = base::Time::Now(); - three_days_ago -= base::TimeDelta::FromDays(3); - EXPECT_TRUE(file_util::SetLastModifiedTime( - tracker->GetFullDBFilePath(kOrigin2, kDB3), three_days_ago)); + base::Time now = base::Time::Now(); + EXPECT_TRUE(base::TouchFile(tracker->GetFullDBFilePath(kOrigin1, kDB1), + now, now)); + EXPECT_TRUE(base::TouchFile(tracker->GetFullDBFilePath(kOrigin2, kDB2), + now, now)); + base::Time three_days_ago = now - base::TimeDelta::FromDays(3); + EXPECT_TRUE(base::TouchFile(tracker->GetFullDBFilePath(kOrigin2, kDB3), + three_days_ago, three_days_ago)); // Delete databases modified since yesterday. db2 is whitelisted. base::Time yesterday = base::Time::Now(); diff --git a/webkit/browser/fileapi/native_file_util.cc b/webkit/browser/fileapi/native_file_util.cc index d195d1e..549de91 100644 --- a/webkit/browser/fileapi/native_file_util.cc +++ b/webkit/browser/fileapi/native_file_util.cc @@ -173,8 +173,7 @@ PlatformFileError NativeFileUtil::Touch( const base::FilePath& path, const base::Time& last_access_time, const base::Time& last_modified_time) { - if (!file_util::TouchFile( - path, last_access_time, last_modified_time)) + if (!base::TouchFile(path, last_access_time, last_modified_time)) return base::PLATFORM_FILE_ERROR_FAILED; return base::PLATFORM_FILE_OK; } @@ -244,7 +243,7 @@ PlatformFileError NativeFileUtil::CopyOrMoveFile( // Preserve the last modified time. Do not return error here even if // the setting is failed, because the copy itself is successfully done. if (option == FileSystemOperation::OPTION_PRESERVE_LAST_MODIFIED) - file_util::SetLastModifiedTime(dest_path, last_modified); + base::TouchFile(dest_path, last_modified, last_modified); return base::PLATFORM_FILE_OK; } |