summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browsing_data_database_helper.cc2
-rw-r--r--chrome/browser/browsing_data_local_storage_helper.cc2
-rw-r--r--chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc4
-rw-r--r--chrome/browser/file_path_watcher_mac.cc4
-rw-r--r--chrome/browser/file_path_watcher_win.cc4
-rw-r--r--chrome/browser/file_system/file_system_backend.cc378
-rw-r--r--chrome/browser/file_system/file_system_backend.h6
-rw-r--r--chrome/browser/file_system/file_system_backend_client.h2
-rw-r--r--chrome/browser/first_run/first_run_gtk.cc2
-rw-r--r--chrome/browser/password_manager/password_store_x_unittest.cc6
-rw-r--r--chrome/browser/policy/config_dir_policy_provider.cc2
-rw-r--r--chrome/browser/renderer_host/resource_message_filter.cc6
-rw-r--r--chrome/browser/renderer_host/resource_message_filter.h7
-rw-r--r--chrome/browser/views/shell_dialogs_win.cc2
14 files changed, 213 insertions, 214 deletions
diff --git a/chrome/browser/browsing_data_database_helper.cc b/chrome/browser/browsing_data_database_helper.cc
index 9b95ca5..c407bc8 100644
--- a/chrome/browser/browsing_data_database_helper.cc
+++ b/chrome/browser/browsing_data_database_helper.cc
@@ -70,7 +70,7 @@ void BrowsingDataDatabaseHelper::FetchDatabaseInfoInFileThread() {
for (std::vector<string16>::const_iterator db = databases.begin();
db != databases.end(); ++db) {
FilePath file_path = tracker_->GetFullDBFilePath(ori->GetOrigin(), *db);
- file_util::FileInfo file_info;
+ base::PlatformFileInfo file_info;
if (file_util::GetFileInfo(file_path, &file_info)) {
database_info_.push_back(DatabaseInfo(
web_security_origin.host().utf8(),
diff --git a/chrome/browser/browsing_data_local_storage_helper.cc b/chrome/browser/browsing_data_local_storage_helper.cc
index 23d68d3..1f94c03 100644
--- a/chrome/browser/browsing_data_local_storage_helper.cc
+++ b/chrome/browser/browsing_data_local_storage_helper.cc
@@ -76,7 +76,7 @@ void BrowsingDataLocalStorageHelper::FetchLocalStorageInfoInWebKitThread() {
// Extension state is not considered browsing data.
continue;
}
- file_util::FileInfo file_info;
+ base::PlatformFileInfo file_info;
bool ret = file_util::GetFileInfo(file_path, &file_info);
if (ret) {
local_storage_info_.push_back(LocalStorageInfo(
diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc b/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc
index 92e897e..30d47eb 100644
--- a/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc
+++ b/chrome/browser/extensions/sandboxed_extension_unpacker_unittest.cc
@@ -181,7 +181,7 @@ TEST_F(SandboxedExtensionUnpackerTest, WithCatalogsSuccess) {
messages_file = GetInstallPath().Append(Extension::kLocaleFolder)
.AppendASCII("en_US")
.Append(Extension::kMessagesFilename);
- file_util::FileInfo old_info;
+ base::PlatformFileInfo old_info;
EXPECT_TRUE(file_util::GetFileInfo(messages_file, &old_info));
// unpacker_->Run unpacks the extension. OnUnpackSucceeded overwrites some
@@ -191,7 +191,7 @@ TEST_F(SandboxedExtensionUnpackerTest, WithCatalogsSuccess) {
OnUnpackSucceeded();
// Check that there is newer _locales/en_US/messages.json file.
- file_util::FileInfo new_info;
+ base::PlatformFileInfo new_info;
EXPECT_TRUE(file_util::GetFileInfo(messages_file, &new_info));
EXPECT_TRUE(new_info.last_modified > old_info.last_modified);
diff --git a/chrome/browser/file_path_watcher_mac.cc b/chrome/browser/file_path_watcher_mac.cc
index 91d9c23..b95992c 100644
--- a/chrome/browser/file_path_watcher_mac.cc
+++ b/chrome/browser/file_path_watcher_mac.cc
@@ -107,7 +107,7 @@ void FilePathWatcherImpl::OnFilePathChanged() {
DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
DCHECK(!target_.empty());
- file_util::FileInfo file_info;
+ base::PlatformFileInfo file_info;
bool file_exists = file_util::GetFileInfo(target_, &file_info);
if (file_exists && (last_modified_.is_null() ||
last_modified_ != file_info.last_modified)) {
@@ -150,7 +150,7 @@ bool FilePathWatcherImpl::Watch(const FilePath& path,
FSEventStreamEventId start_event = FSEventsGetCurrentEventId();
- file_util::FileInfo file_info;
+ base::PlatformFileInfo file_info;
if (file_util::GetFileInfo(target_, &file_info)) {
last_modified_ = file_info.last_modified;
first_notification_ = base::Time::Now();
diff --git a/chrome/browser/file_path_watcher_win.cc b/chrome/browser/file_path_watcher_win.cc
index 194e91e..71622f9 100644
--- a/chrome/browser/file_path_watcher_win.cc
+++ b/chrome/browser/file_path_watcher_win.cc
@@ -99,7 +99,7 @@ void FilePathWatcherImpl::OnObjectSignaled(HANDLE object) {
}
// Check whether the event applies to |target_| and notify the delegate.
- file_util::FileInfo file_info;
+ base::PlatformFileInfo file_info;
bool file_exists = file_util::GetFileInfo(target_, &file_info);
if (file_exists && (last_modified_.is_null() ||
last_modified_ != file_info.last_modified)) {
@@ -183,7 +183,7 @@ bool FilePathWatcherImpl::UpdateWatch() {
if (handle_ != INVALID_HANDLE_VALUE)
DestroyWatch();
- file_util::FileInfo file_info;
+ base::PlatformFileInfo file_info;
if (file_util::GetFileInfo(target_, &file_info)) {
last_modified_ = file_info.last_modified;
first_notification_ = base::Time::Now();
diff --git a/chrome/browser/file_system/file_system_backend.cc b/chrome/browser/file_system/file_system_backend.cc
index 36b1005..12847ed 100644
--- a/chrome/browser/file_system/file_system_backend.cc
+++ b/chrome/browser/file_system/file_system_backend.cc
@@ -1,188 +1,190 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/file_util_proxy.h"
-#include "base/platform_file.h"
-#include "chrome/browser/chrome_thread.h"
-#include "chrome/browser/file_system/file_system_backend.h"
-#include "chrome/browser/file_system/file_system_backend_client.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebFileError.h"
-
-namespace {
-// Utility method for error conversions.
-WebKit::WebFileError PlatformToWebkitError(base::PlatformFileError rv) {
- switch (rv) {
- case base::PLATFORM_FILE_ERROR_NOT_FOUND:
- return WebKit::WebFileErrorNotFound;
- case base::PLATFORM_FILE_ERROR_INVALID_OPERATION:
- case base::PLATFORM_FILE_ERROR_EXISTS:
- case base::PLATFORM_FILE_ERROR_NOT_A_DIRECTORY:
- return WebKit::WebFileErrorInvalidModification;
- case base::PLATFORM_FILE_ERROR_ACCESS_DENIED:
- return WebKit::WebFileErrorInvalidModification;
- default:
- return WebKit::WebFileErrorNoModificationAllowed;
- }
-}
-} // namespace
-
-FileSystemBackend::FileSystemBackend()
- : callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {}
-
-void FileSystemBackend::set_client(FileSystemBackendClient* client) {
- client_ = client;
-}
-
-void FileSystemBackend::CreateFile(const FilePath& path,
- bool exclusive,
- int request_id) {
- request_id_ = request_id;
- base::FileUtilProxy::CreateOrOpen(
- ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE),
- path, base::PLATFORM_FILE_CREATE,
- callback_factory_.NewCallback(
- exclusive ? &FileSystemBackend::DidCreateFileExclusive
- : &FileSystemBackend::DidCreateFileNonExclusive));
-}
-
-void FileSystemBackend::CreateDirectory(const FilePath& path,
- bool exclusive,
- int request_id) {
- request_id_ = request_id;
- base::FileUtilProxy::CreateDirectory(
- ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE),
- path, exclusive, callback_factory_.NewCallback(
- &FileSystemBackend::DidFinishFileOperation));
-}
-
-void FileSystemBackend::Copy(const FilePath& src_path,
- const FilePath& dest_path,
- int request_id) {
- request_id_ = request_id;
- base::FileUtilProxy::Copy(
- ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE),
- src_path, dest_path, callback_factory_.NewCallback(
- &FileSystemBackend::DidFinishFileOperation));
-}
-
-void FileSystemBackend::Move(const FilePath& src_path,
- const FilePath& dest_path,
- int request_id) {
- request_id_ = request_id;
- base::FileUtilProxy::Move(
- ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE),
- src_path, dest_path, callback_factory_.NewCallback(
- &FileSystemBackend::DidFinishFileOperation));
-}
-
-void FileSystemBackend::DirectoryExists(const FilePath& path, int request_id) {
- request_id_ = request_id;
- base::FileUtilProxy::GetFileInfo(
- ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE),
- path, callback_factory_.NewCallback(
- &FileSystemBackend::DidDirectoryExists));
-}
-
-void FileSystemBackend::FileExists(const FilePath& path, int request_id) {
- request_id_ = request_id;
- base::FileUtilProxy::GetFileInfo(
- ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE),
- path, callback_factory_.NewCallback(&FileSystemBackend::DidFileExists));
-}
-
-void FileSystemBackend::GetMetadata(const FilePath& path, int request_id) {
- request_id_ = request_id;
- base::FileUtilProxy::GetFileInfo(
- ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE),
- path, callback_factory_.NewCallback(&FileSystemBackend::DidGetMetadata));
-}
-
-void FileSystemBackend::ReadDirectory(
- const FilePath& path, int request_id) {
- request_id_ = request_id;
- base::FileUtilProxy::ReadDirectory(
- ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE),
- path, callback_factory_.NewCallback(
- &FileSystemBackend::DidReadDirectory));
-}
-
-void FileSystemBackend::Remove(const FilePath& path, int request_id) {
- request_id_ = request_id;
- base::FileUtilProxy::Delete(
- ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE),
- path, callback_factory_.NewCallback(
- &FileSystemBackend::DidFinishFileOperation));
-}
-
-void FileSystemBackend::DidCreateFileExclusive(base::PlatformFileError rv,
- base::PassPlatformFile file,
- bool created) {
- DidFinishFileOperation(rv);
-}
-
-void FileSystemBackend::DidCreateFileNonExclusive(base::PlatformFileError rv,
- base::PassPlatformFile file,
- bool created) {
- // Supress the already exists error and report success.
- if (rv == base::PLATFORM_FILE_OK ||
- rv == base::PLATFORM_FILE_ERROR_EXISTS)
- client_->DidSucceed(rv);
- else
- client_->DidFail(PlatformToWebkitError(rv), request_id_);
-}
-
-void FileSystemBackend::DidFinishFileOperation(base::PlatformFileError rv) {
- DCHECK(client_);
- if (rv == base::PLATFORM_FILE_OK)
- client_->DidSucceed(request_id_);
- else
- client_->DidFail(PlatformToWebkitError(rv), request_id_);
-}
-
-void FileSystemBackend::DidDirectoryExists(
- base::PlatformFileError rv, const file_util::FileInfo& file_info) {
- DCHECK(client_);
- if (rv == base::PLATFORM_FILE_OK) {
- if (file_info.is_directory)
- client_->DidSucceed(request_id_);
- else
- client_->DidFail(WebKit::WebFileErrorInvalidState, request_id_);
- } else {
- // Something else went wrong.
- client_->DidFail(PlatformToWebkitError(rv), request_id_);
- }
-}
-
-void FileSystemBackend::DidFileExists(base::PlatformFileError rv,
- const file_util::FileInfo& file_info) {
- DCHECK(client_);
- if (rv == base::PLATFORM_FILE_OK) {
- if (file_info.is_directory)
- client_->DidFail(WebKit::WebFileErrorInvalidState, request_id_);
- else
- client_->DidSucceed(request_id_);
- } else {
- // Something else went wrong.
- client_->DidFail(PlatformToWebkitError(rv), request_id_);
- }
-}
-
-void FileSystemBackend::DidGetMetadata(base::PlatformFileError rv,
- const file_util::FileInfo& file_info) {
- DCHECK(client_);
- if (rv == base::PLATFORM_FILE_OK)
- client_->DidReadMetadata(file_info, request_id_);
- else
- client_->DidFail(PlatformToWebkitError(rv), request_id_);
-}
-
-void FileSystemBackend::DidReadDirectory(
- base::PlatformFileError rv,
- const std::vector<base::file_util_proxy::Entry>& entries) {
- DCHECK(client_);
- if (rv == base::PLATFORM_FILE_OK)
- client_->DidReadDirectory(entries, false /* has_more */ , request_id_);
- else
- client_->DidFail(PlatformToWebkitError(rv), request_id_);
-}
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/file_util_proxy.h"
+#include "base/platform_file.h"
+#include "chrome/browser/chrome_thread.h"
+#include "chrome/browser/file_system/file_system_backend.h"
+#include "chrome/browser/file_system/file_system_backend_client.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebFileError.h"
+
+namespace {
+// Utility method for error conversions.
+WebKit::WebFileError PlatformToWebkitError(base::PlatformFileError rv) {
+ switch (rv) {
+ case base::PLATFORM_FILE_ERROR_NOT_FOUND:
+ return WebKit::WebFileErrorNotFound;
+ case base::PLATFORM_FILE_ERROR_INVALID_OPERATION:
+ case base::PLATFORM_FILE_ERROR_EXISTS:
+ case base::PLATFORM_FILE_ERROR_NOT_A_DIRECTORY:
+ return WebKit::WebFileErrorInvalidModification;
+ case base::PLATFORM_FILE_ERROR_ACCESS_DENIED:
+ return WebKit::WebFileErrorInvalidModification;
+ default:
+ return WebKit::WebFileErrorNoModificationAllowed;
+ }
+}
+} // namespace
+
+FileSystemBackend::FileSystemBackend()
+ : callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {}
+
+void FileSystemBackend::set_client(FileSystemBackendClient* client) {
+ client_ = client;
+}
+
+void FileSystemBackend::CreateFile(const FilePath& path,
+ bool exclusive,
+ int request_id) {
+ request_id_ = request_id;
+ base::FileUtilProxy::CreateOrOpen(
+ ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE),
+ path, base::PLATFORM_FILE_CREATE,
+ callback_factory_.NewCallback(
+ exclusive ? &FileSystemBackend::DidCreateFileExclusive
+ : &FileSystemBackend::DidCreateFileNonExclusive));
+}
+
+void FileSystemBackend::CreateDirectory(const FilePath& path,
+ bool exclusive,
+ int request_id) {
+ request_id_ = request_id;
+ base::FileUtilProxy::CreateDirectory(
+ ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE),
+ path, exclusive, callback_factory_.NewCallback(
+ &FileSystemBackend::DidFinishFileOperation));
+}
+
+void FileSystemBackend::Copy(const FilePath& src_path,
+ const FilePath& dest_path,
+ int request_id) {
+ request_id_ = request_id;
+ base::FileUtilProxy::Copy(
+ ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE),
+ src_path, dest_path, callback_factory_.NewCallback(
+ &FileSystemBackend::DidFinishFileOperation));
+}
+
+void FileSystemBackend::Move(const FilePath& src_path,
+ const FilePath& dest_path,
+ int request_id) {
+ request_id_ = request_id;
+ base::FileUtilProxy::Move(
+ ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE),
+ src_path, dest_path, callback_factory_.NewCallback(
+ &FileSystemBackend::DidFinishFileOperation));
+}
+
+void FileSystemBackend::DirectoryExists(const FilePath& path, int request_id) {
+ request_id_ = request_id;
+ base::FileUtilProxy::GetFileInfo(
+ ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE),
+ path, callback_factory_.NewCallback(
+ &FileSystemBackend::DidDirectoryExists));
+}
+
+void FileSystemBackend::FileExists(const FilePath& path, int request_id) {
+ request_id_ = request_id;
+ base::FileUtilProxy::GetFileInfo(
+ ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE),
+ path, callback_factory_.NewCallback(&FileSystemBackend::DidFileExists));
+}
+
+void FileSystemBackend::GetMetadata(const FilePath& path, int request_id) {
+ request_id_ = request_id;
+ base::FileUtilProxy::GetFileInfo(
+ ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE),
+ path, callback_factory_.NewCallback(&FileSystemBackend::DidGetMetadata));
+}
+
+void FileSystemBackend::ReadDirectory(
+ const FilePath& path, int request_id) {
+ request_id_ = request_id;
+ base::FileUtilProxy::ReadDirectory(
+ ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE),
+ path, callback_factory_.NewCallback(
+ &FileSystemBackend::DidReadDirectory));
+}
+
+void FileSystemBackend::Remove(const FilePath& path, int request_id) {
+ request_id_ = request_id;
+ base::FileUtilProxy::Delete(
+ ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE),
+ path, callback_factory_.NewCallback(
+ &FileSystemBackend::DidFinishFileOperation));
+}
+
+void FileSystemBackend::DidCreateFileExclusive(base::PlatformFileError rv,
+ base::PassPlatformFile file,
+ bool created) {
+ DidFinishFileOperation(rv);
+}
+
+void FileSystemBackend::DidCreateFileNonExclusive(base::PlatformFileError rv,
+ base::PassPlatformFile file,
+ bool created) {
+ // Supress the already exists error and report success.
+ if (rv == base::PLATFORM_FILE_OK ||
+ rv == base::PLATFORM_FILE_ERROR_EXISTS)
+ client_->DidSucceed(rv);
+ else
+ client_->DidFail(PlatformToWebkitError(rv), request_id_);
+}
+
+void FileSystemBackend::DidFinishFileOperation(base::PlatformFileError rv) {
+ DCHECK(client_);
+ if (rv == base::PLATFORM_FILE_OK)
+ client_->DidSucceed(request_id_);
+ else
+ client_->DidFail(PlatformToWebkitError(rv), request_id_);
+}
+
+void FileSystemBackend::DidDirectoryExists(
+ base::PlatformFileError rv, const base::PlatformFileInfo& file_info) {
+ DCHECK(client_);
+ if (rv == base::PLATFORM_FILE_OK) {
+ if (file_info.is_directory)
+ client_->DidSucceed(request_id_);
+ else
+ client_->DidFail(WebKit::WebFileErrorInvalidState, request_id_);
+ } else {
+ // Something else went wrong.
+ client_->DidFail(PlatformToWebkitError(rv), request_id_);
+ }
+}
+
+void FileSystemBackend::DidFileExists(
+ base::PlatformFileError rv,
+ const base::PlatformFileInfo& file_info) {
+ DCHECK(client_);
+ if (rv == base::PLATFORM_FILE_OK) {
+ if (file_info.is_directory)
+ client_->DidFail(WebKit::WebFileErrorInvalidState, request_id_);
+ else
+ client_->DidSucceed(request_id_);
+ } else {
+ // Something else went wrong.
+ client_->DidFail(PlatformToWebkitError(rv), request_id_);
+ }
+}
+
+void FileSystemBackend::DidGetMetadata(
+ base::PlatformFileError rv,
+ const base::PlatformFileInfo& file_info) {
+ DCHECK(client_);
+ if (rv == base::PLATFORM_FILE_OK)
+ client_->DidReadMetadata(file_info, request_id_);
+ else
+ client_->DidFail(PlatformToWebkitError(rv), request_id_);
+}
+
+void FileSystemBackend::DidReadDirectory(
+ base::PlatformFileError rv,
+ const std::vector<base::file_util_proxy::Entry>& entries) {
+ DCHECK(client_);
+ if (rv == base::PLATFORM_FILE_OK)
+ client_->DidReadDirectory(entries, false /* has_more */ , request_id_);
+ else
+ client_->DidFail(PlatformToWebkitError(rv), request_id_);
+}
diff --git a/chrome/browser/file_system/file_system_backend.h b/chrome/browser/file_system/file_system_backend.h
index 9b33afb..5ee511a 100644
--- a/chrome/browser/file_system/file_system_backend.h
+++ b/chrome/browser/file_system/file_system_backend.h
@@ -59,13 +59,13 @@ class FileSystemBackend {
void DidFinishFileOperation(base::PlatformFileError rv);
void DidDirectoryExists(base::PlatformFileError rv,
- const file_util::FileInfo& file_info);
+ const base::PlatformFileInfo& file_info);
void DidFileExists(base::PlatformFileError rv,
- const file_util::FileInfo& file_info);
+ const base::PlatformFileInfo& file_info);
void DidGetMetadata(base::PlatformFileError rv,
- const file_util::FileInfo& file_info);
+ const base::PlatformFileInfo& file_info);
void DidReadDirectory(
base::PlatformFileError rv,
diff --git a/chrome/browser/file_system/file_system_backend_client.h b/chrome/browser/file_system/file_system_backend_client.h
index 6da0bc2..ad969ab1 100644
--- a/chrome/browser/file_system/file_system_backend_client.h
+++ b/chrome/browser/file_system/file_system_backend_client.h
@@ -20,7 +20,7 @@ class FileSystemBackendClient {
virtual void DidSucceed(int request_id) = 0;
// Info about the file entry such as modification date and size.
- virtual void DidReadMetadata(const file_util::FileInfo& info,
+ virtual void DidReadMetadata(const base::PlatformFileInfo& info,
int request_id) = 0;
virtual void DidReadDirectory(
diff --git a/chrome/browser/first_run/first_run_gtk.cc b/chrome/browser/first_run/first_run_gtk.cc
index d920f4e8..3c5e792 100644
--- a/chrome/browser/first_run/first_run_gtk.cc
+++ b/chrome/browser/first_run/first_run_gtk.cc
@@ -124,7 +124,7 @@ double Upgrade::GetLastModifiedTimeOfExe() {
LOG(WARNING) << "Failed to get FilePath object for FILE_EXE.";
return saved_last_modified_time_of_exe_;
}
- file_util::FileInfo exe_file_info;
+ base::PlatformFileInfo exe_file_info;
if (!file_util::GetFileInfo(exe_file_path, &exe_file_info)) {
LOG(WARNING) << "Failed to get FileInfo object for FILE_EXE - "
<< exe_file_path.value();
diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc
index b8f56db..1bb1ab3 100644
--- a/chrome/browser/password_manager/password_store_x_unittest.cc
+++ b/chrome/browser/password_manager/password_store_x_unittest.cc
@@ -600,7 +600,7 @@ TEST_P(PasswordStoreXTest, NativeMigration) {
// Get the initial size of the login DB file, before we populate it.
// This will be used later to make sure it gets back to this size.
const FilePath login_db_file = temp_dir_.path().Append("login_test");
- file_util::FileInfo db_file_start_info;
+ base::PlatformFileInfo db_file_start_info;
ASSERT_TRUE(file_util::GetFileInfo(login_db_file, &db_file_start_info));
LoginDatabase* login_db = login_db_.get();
@@ -630,7 +630,7 @@ TEST_P(PasswordStoreXTest, NativeMigration) {
done.Wait();
// Get the new size of the login DB file. We expect it to be larger.
- file_util::FileInfo db_file_full_info;
+ base::PlatformFileInfo db_file_full_info;
ASSERT_TRUE(file_util::GetFileInfo(login_db_file, &db_file_full_info));
EXPECT_GT(db_file_full_info.size, db_file_start_info.size);
@@ -717,7 +717,7 @@ TEST_P(PasswordStoreXTest, NativeMigration) {
// recreated. We approximate checking for this by checking that the file
// size is equal to the size before we populated it, even though it was
// larger after populating it.
- file_util::FileInfo db_file_end_info;
+ base::PlatformFileInfo db_file_end_info;
ASSERT_TRUE(file_util::GetFileInfo(login_db_file, &db_file_end_info));
EXPECT_EQ(db_file_start_info.size, db_file_end_info.size);
}
diff --git a/chrome/browser/policy/config_dir_policy_provider.cc b/chrome/browser/policy/config_dir_policy_provider.cc
index 6875bd7..7f1a738 100644
--- a/chrome/browser/policy/config_dir_policy_provider.cc
+++ b/chrome/browser/policy/config_dir_policy_provider.cc
@@ -146,7 +146,7 @@ DictionaryValue* PolicyDirLoader::Load() {
bool PolicyDirLoader::IsSafeToReloadPolicy(const base::Time& now,
base::TimeDelta* delay) {
DCHECK(delay);
- file_util::FileInfo dir_info;
+ base::PlatformFileInfo dir_info;
// Reading an empty directory or a file is always safe.
if (!file_util::GetFileInfo(config_dir_, &dir_info) ||
diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc
index ce3e601..66076ae 100644
--- a/chrome/browser/renderer_host/resource_message_filter.cc
+++ b/chrome/browser/renderer_host/resource_message_filter.cc
@@ -199,12 +199,12 @@ class ClearCacheCompletion : public net::CompletionCallback {
};
void WriteFileSize(IPC::Message* reply_msg,
- const file_util::FileInfo& file_info) {
+ const base::PlatformFileInfo& file_info) {
ViewHostMsg_GetFileSize::WriteReplyParams(reply_msg, file_info.size);
}
void WriteFileModificationTime(IPC::Message* reply_msg,
- const file_util::FileInfo& file_info) {
+ const base::PlatformFileInfo& file_info) {
ViewHostMsg_GetFileModificationTime::WriteReplyParams(
reply_msg, file_info.last_modified);
}
@@ -1499,7 +1499,7 @@ void ResourceMessageFilter::OnGetFileInfoOnFileThread(
FileInfoWriteFunc write_func) {
DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
- file_util::FileInfo file_info;
+ base::PlatformFileInfo file_info;
file_info.size = 0;
file_util::GetFileInfo(path, &file_info);
diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h
index dc839bb..83e7452 100644
--- a/chrome/browser/renderer_host/resource_message_filter.h
+++ b/chrome/browser/renderer_host/resource_message_filter.h
@@ -51,6 +51,7 @@ struct ViewHostMsg_CreateWorker_Params;
struct WebPluginInfo;
namespace base {
+struct PlatformFileInfo;
class SharedMemory;
}
@@ -58,10 +59,6 @@ namespace device_orientation {
class DispatcherHost;
}
-namespace file_util {
-struct FileInfo;
-}
-
namespace net {
class CookieStore;
}
@@ -134,7 +131,7 @@ class ResourceMessageFilter : public IPC::ChannelProxy::MessageFilter,
friend class ChromeThread;
friend class DeleteTask<ResourceMessageFilter>;
typedef void (*FileInfoWriteFunc)(IPC::Message* reply_msg,
- const file_util::FileInfo& file_info);
+ const base::PlatformFileInfo& file_info);
virtual ~ResourceMessageFilter();
diff --git a/chrome/browser/views/shell_dialogs_win.cc b/chrome/browser/views/shell_dialogs_win.cc
index a90b7fb..e09fa73 100644
--- a/chrome/browser/views/shell_dialogs_win.cc
+++ b/chrome/browser/views/shell_dialogs_win.cc
@@ -846,7 +846,7 @@ bool SelectFileDialogImpl::RunOpenFileDialog(
// Use lpstrInitialDir to specify the initial directory
if (!path->empty()) {
bool is_dir;
- file_util::FileInfo file_info;
+ base::PlatformFileInfo file_info;
if (file_util::GetFileInfo(*path, &file_info))
is_dir = file_info.is_directory;
else
generated by cgit v1.1 at 2025-02-15 19:40:39 +0000