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 /net | |
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 'net')
-rw-r--r-- | net/base/upload_data_stream.cc | 2 | ||||
-rw-r--r-- | net/base/upload_data_stream_unittest.cc | 3 | ||||
-rw-r--r-- | net/proxy/proxy_config_service_linux.cc | 4 | ||||
-rw-r--r-- | net/url_request/url_request_file_job.cc | 8 | ||||
-rw-r--r-- | net/url_request/url_request_file_job.h | 2 |
5 files changed, 9 insertions, 10 deletions
diff --git a/net/base/upload_data_stream.cc b/net/base/upload_data_stream.cc index 140aa8a..edcff19 100644 --- a/net/base/upload_data_stream.cc +++ b/net/base/upload_data_stream.cc @@ -82,7 +82,7 @@ int UploadDataStream::FillBuf() { // Note that the expected modification time from WebKit is based on // time_t precision. So we have to convert both to time_t to compare. if (!element.expected_file_modification_time().is_null()) { - file_util::FileInfo info; + base::PlatformFileInfo info; if (file_util::GetFileInfo(element.file_path(), &info) && element.expected_file_modification_time().ToTimeT() != info.last_modified.ToTimeT()) { diff --git a/net/base/upload_data_stream_unittest.cc b/net/base/upload_data_stream_unittest.cc index 5fd9666..8a21ad6 100644 --- a/net/base/upload_data_stream_unittest.cc +++ b/net/base/upload_data_stream_unittest.cc @@ -109,7 +109,7 @@ TEST_F(UploadDataStreamTest, FileChanged) { ASSERT_EQ(kTestDataSize, file_util::WriteFile(temp_file_path, kTestData, kTestDataSize)); - file_util::FileInfo file_info; + base::PlatformFileInfo file_info; ASSERT_TRUE(file_util::GetFileInfo(temp_file_path, &file_info)); // Test file not changed. @@ -124,4 +124,3 @@ TEST_F(UploadDataStreamTest, FileChanged) { } } // namespace net - diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc index a3b01b7..669ea79 100644 --- a/net/proxy/proxy_config_service_linux.cc +++ b/net/proxy/proxy_config_service_linux.cc @@ -459,8 +459,8 @@ class GConfSettingGetterImplKDE FilePath kde4_config = KDEHomeToConfigPath(kde4_path); bool use_kde4 = false; if (file_util::DirectoryExists(kde4_path)) { - file_util::FileInfo kde3_info; - file_util::FileInfo kde4_info; + base::PlatformFileInfo kde3_info; + base::PlatformFileInfo kde4_info; if (file_util::GetFileInfo(kde4_config, &kde4_info)) { if (file_util::GetFileInfo(kde3_config, &kde3_info)) { use_kde4 = kde4_info.last_modified >= kde3_info.last_modified; diff --git a/net/url_request/url_request_file_job.cc b/net/url_request/url_request_file_job.cc index 39258eb..8c282ff 100644 --- a/net/url_request/url_request_file_job.cc +++ b/net/url_request/url_request_file_job.cc @@ -47,7 +47,7 @@ class URLRequestFileJob::AsyncResolver : } void Resolve(const FilePath& file_path) { - file_util::FileInfo file_info; + base::PlatformFileInfo file_info; bool exists = file_util::GetFileInfo(file_path, &file_info); AutoLock locked(lock_); if (owner_loop_) { @@ -68,7 +68,7 @@ class URLRequestFileJob::AsyncResolver : ~AsyncResolver() {} - void ReturnResults(bool exists, const file_util::FileInfo& file_info) { + void ReturnResults(bool exists, const base::PlatformFileInfo& file_info) { if (owner_) owner_->DidResolve(exists, file_info); } @@ -128,7 +128,7 @@ void URLRequestFileJob::Start() { return; } #endif - file_util::FileInfo file_info; + base::PlatformFileInfo file_info; bool exists = file_util::GetFileInfo(file_path_, &file_info); // Continue asynchronously. @@ -221,7 +221,7 @@ void URLRequestFileJob::SetExtraRequestHeaders( } void URLRequestFileJob::DidResolve( - bool exists, const file_util::FileInfo& file_info) { + bool exists, const base::PlatformFileInfo& file_info) { #if defined(OS_WIN) async_resolver_ = NULL; #endif diff --git a/net/url_request/url_request_file_job.h b/net/url_request/url_request_file_job.h index 5185ab6..adf9d24 100644 --- a/net/url_request/url_request_file_job.h +++ b/net/url_request/url_request_file_job.h @@ -42,7 +42,7 @@ class URLRequestFileJob : public URLRequestJob { FilePath file_path_; private: - void DidResolve(bool exists, const file_util::FileInfo& file_info); + void DidResolve(bool exists, const base::PlatformFileInfo& file_info); void DidRead(int result); net::CompletionCallbackImpl<URLRequestFileJob> io_callback_; |