diff options
author | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 02:28:37 +0000 |
---|---|---|
committer | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 02:28:37 +0000 |
commit | 2f0193c279b1b40a82a6ad027ec9468272eb25b2 (patch) | |
tree | 9d2e2f5bcf09837a1189723567906fb8de45c7e2 /webkit | |
parent | 4c56ef5fbed46794f2b16b9f8ed88ac179d65309 (diff) | |
download | chromium_src-2f0193c279b1b40a82a6ad027ec9468272eb25b2.zip chromium_src-2f0193c279b1b40a82a6ad027ec9468272eb25b2.tar.gz chromium_src-2f0193c279b1b40a82a6ad027ec9468272eb25b2.tar.bz2 |
Moving file_util::FileInfo to base::PlatformFileInfo, and adding the
last_accessed and creation_time fields.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3347005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58454 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/blob/blob_url_request_job.cc | 4 | ||||
-rw-r--r-- | webkit/blob/blob_url_request_job.h | 7 | ||||
-rw-r--r-- | webkit/blob/blob_url_request_job_unittest.cc | 4 | ||||
-rw-r--r-- | webkit/database/database_tracker.cc | 2 | ||||
-rw-r--r-- | webkit/glue/plugins/plugin_host.cc | 2 | ||||
-rw-r--r-- | webkit/glue/plugins/plugin_list_posix.cc | 2 | ||||
-rw-r--r-- | webkit/glue/webfileutilities_impl.cc | 2 |
7 files changed, 10 insertions, 13 deletions
diff --git a/webkit/blob/blob_url_request_job.cc b/webkit/blob/blob_url_request_job.cc index 62712d5..41165e5 100644 --- a/webkit/blob/blob_url_request_job.cc +++ b/webkit/blob/blob_url_request_job.cc @@ -105,7 +105,7 @@ void BlobURLRequestJob::ResolveFile(const FilePath& file_path) { // Otherwise, we use current thread, i.e. IO thread, as this is the case when // we run the unittest or test shell. // TODO(jianli): Consider using the proxy of current thread. - file_util::FileInfo file_info; + base::PlatformFileInfo file_info; bool exists = file_util::GetFileInfo(file_path, &file_info); // Continue asynchronously. @@ -116,7 +116,7 @@ void BlobURLRequestJob::ResolveFile(const FilePath& file_path) { } void BlobURLRequestJob::DidResolve(base::PlatformFileError rv, - const file_util::FileInfo& file_info) { + const base::PlatformFileInfo& file_info) { // We may have been orphaned... if (!request_) return; diff --git a/webkit/blob/blob_url_request_job.h b/webkit/blob/blob_url_request_job.h index 780a642..8a859cc 100644 --- a/webkit/blob/blob_url_request_job.h +++ b/webkit/blob/blob_url_request_job.h @@ -17,10 +17,7 @@ namespace base { class MessageLoopProxy; -} - -namespace file_util { -struct FileInfo; +struct PlatformFileInfo; } namespace webkit_blob { @@ -59,7 +56,7 @@ class BlobURLRequestJob : public URLRequestJob { void DidStart(); void DidResolve(base::PlatformFileError rv, - const file_util::FileInfo& file_info); + const base::PlatformFileInfo& file_info); void DidRead(int result); base::ScopedCallbackFactory<BlobURLRequestJob> callback_factory_; diff --git a/webkit/blob/blob_url_request_job_unittest.cc b/webkit/blob/blob_url_request_job_unittest.cc index 7afe699..ad4ecb4 100644 --- a/webkit/blob/blob_url_request_job_unittest.cc +++ b/webkit/blob/blob_url_request_job_unittest.cc @@ -129,7 +129,7 @@ class BlobURLRequestJobTest : public testing::Test { ASSERT_EQ(static_cast<int>(arraysize(kTestFileData1) - 1), file_util::WriteFile(temp_file1_, kTestFileData1, arraysize(kTestFileData1) - 1)); - file_util::FileInfo file_info1; + base::PlatformFileInfo file_info1; file_util::GetFileInfo(temp_file1_, &file_info1); temp_file_modification_time1_ = file_info1.last_modified; @@ -137,7 +137,7 @@ class BlobURLRequestJobTest : public testing::Test { ASSERT_EQ(static_cast<int>(arraysize(kTestFileData2) - 1), file_util::WriteFile(temp_file2_, kTestFileData2, arraysize(kTestFileData2) - 1)); - file_util::FileInfo file_info2; + base::PlatformFileInfo file_info2; file_util::GetFileInfo(temp_file2_, &file_info2); temp_file_modification_time2_ = file_info2.last_modified; diff --git a/webkit/database/database_tracker.cc b/webkit/database/database_tracker.cc index 8a8a21d..06227d7 100644 --- a/webkit/database/database_tracker.cc +++ b/webkit/database/database_tracker.cc @@ -550,7 +550,7 @@ int DatabaseTracker::DeleteDataModifiedSince( for (std::vector<DatabaseDetails>::const_iterator db = details.begin(); db != details.end(); ++db) { FilePath db_file = GetFullDBFilePath(*ori, db->database_name); - file_util::FileInfo file_info; + base::PlatformFileInfo file_info; file_util::GetFileInfo(db_file, &file_info); if (file_info.last_modified < cutoff) continue; diff --git a/webkit/glue/plugins/plugin_host.cc b/webkit/glue/plugins/plugin_host.cc index 2cdf076b..a1a6d5f 100644 --- a/webkit/glue/plugins/plugin_host.cc +++ b/webkit/glue/plugins/plugin_host.cc @@ -450,7 +450,7 @@ static NPError PostURLNotify(NPP id, base::SysNativeMBToWide(file_path_ascii)); } - file_util::FileInfo post_file_info = {0}; + base::PlatformFileInfo post_file_info = {0}; if (!file_util::GetFileInfo(file_path, &post_file_info) || post_file_info.is_directory) return NPERR_FILE_NOT_FOUND; diff --git a/webkit/glue/plugins/plugin_list_posix.cc b/webkit/glue/plugins/plugin_list_posix.cc index 176a615..95b49c3 100644 --- a/webkit/glue/plugins/plugin_list_posix.cc +++ b/webkit/glue/plugins/plugin_list_posix.cc @@ -220,7 +220,7 @@ void PluginList::LoadPluginsFromDir(const FilePath& dir_path, } // Get mtime. - file_util::FileInfo info; + base::PlatformFileInfo info; if (!file_util::GetFileInfo(path, &info)) continue; diff --git a/webkit/glue/webfileutilities_impl.cc b/webkit/glue/webfileutilities_impl.cc index a5b8fcc..a77184d 100644 --- a/webkit/glue/webfileutilities_impl.cc +++ b/webkit/glue/webfileutilities_impl.cc @@ -55,7 +55,7 @@ bool WebFileUtilitiesImpl::getFileModificationTime(const WebString& path, NOTREACHED(); return false; } - file_util::FileInfo info; + base::PlatformFileInfo info; if (!file_util::GetFileInfo(WebStringToFilePath(path), &info)) return false; result = info.last_modified.ToDoubleT(); |