diff --git a/base/file_util_proxy.cc b/base/file_util_proxy.cc
index fc96e8f815735aefc0ed258bd83e746b4bfb3aff..bd089091f73ef550a2e5b7e0aab1fee02a3e2144 100644
--- a/base/file_util_proxy.cc
+++ b/base/file_util_proxy.cc
@@ -66,7 +66,7 @@ static base::PlatformFileError PerformCommonCheckAndPreparationForMoveAndCopy(
return base::PLATFORM_FILE_OK;
}
-} // anonymous namespace
+} // anonymous namespace
class MessageLoopRelay
: public base::RefCountedThreadSafe<MessageLoopRelay> {
@@ -442,7 +442,7 @@ class RelayReadDirectory : public MessageLoopRelay {
file_util::FileEnumerator::DIRECTORIES));
FilePath current;
while (!(current = file_enum.Next()).empty()) {
- base::file_util_proxy::Entry entry;
+ base::FileUtilProxy::Entry entry;
file_util::FileEnumerator::FindInfo info;
file_enum.GetFindInfo(&info);
entry.is_directory = file_enum.IsDirectory(info);
@@ -461,7 +461,7 @@ class RelayReadDirectory : public MessageLoopRelay {
private:
base::FileUtilProxy::ReadDirectoryCallback* callback_;
FilePath file_path_;
- std::vector<base::file_util_proxy::Entry> entries_;
+ std::vector<base::FileUtilProxy::Entry> entries_;
};
class RelayGetFileInfo : public MessageLoopRelay {
diff --git a/base/file_util_proxy.h b/base/file_util_proxy.h
index 09c23778a09bb49c8f49d8173d8800548398c72b..f2665628051b0889bb12d5501840bf25b0612064 100644
--- a/base/file_util_proxy.h
+++ b/base/file_util_proxy.h
@@ -16,35 +16,30 @@
namespace base {
-namespace file_util_proxy {
-
-// Holds metadata for file or directory entry.
-struct Entry {
- FilePath::StringType name;
- bool is_directory;
-};
-
-} // namespace file_util_proxy
-
class MessageLoopProxy;
class Time;
// This class provides asynchronous access to common file routines.
class FileUtilProxy {
public:
+ // Holds metadata for file or directory entry. Used by ReadDirectoryCallback.
+ struct Entry {
+ FilePath::StringType name;
+ bool is_directory;
+ };
+
// This callback is used by methods that report only an error code. It is
// valid to pass NULL as the callback parameter to any function that takes a
// StatusCallback, in which case the operation will complete silently.
- typedef Callback1<base::PlatformFileError /* error code */
- >::Type StatusCallback;
+ typedef Callback1<PlatformFileError /* error code */>::Type StatusCallback;
// Creates or opens a file with the given flags. It is invalid to pass NULL
// for the callback.
// If PLATFORM_FILE_CREATE is set in |file_flags| it always tries to create
// a new file at the given |file_path| and calls back with
// PLATFORM_FILE_ERROR_FILE_EXISTS if the |file_path| already exists.
- typedef Callback3<base::PlatformFileError /* error code */,
- base::PassPlatformFile,
+ typedef Callback3<PlatformFileError /* error code */,
+ PassPlatformFile,
bool /* created */>::Type CreateOrOpenCallback;
static bool CreateOrOpen(scoped_refptr<MessageLoopProxy> message_loop_proxy,
const FilePath& file_path,
@@ -53,8 +48,8 @@ class FileUtilProxy {
// Creates a temporary file for writing. The path and an open file handle
// are returned. It is invalid to pass NULL for the callback.
- typedef Callback3<base::PlatformFileError /* error code */,
- base::PassPlatformFile,
+ typedef Callback3<PlatformFileError /* error code */,
+ PassPlatformFile,
FilePath>::Type CreateTemporaryCallback;
static bool CreateTemporary(
scoped_refptr<MessageLoopProxy> message_loop_proxy,
@@ -62,7 +57,7 @@ class FileUtilProxy {
// Close the given file handle.
static bool Close(scoped_refptr<MessageLoopProxy> message_loop_proxy,
- base::PlatformFile,
+ PlatformFile,
StatusCallback* callback);
// Ensures that the given |file_path| exist. This creates a empty new file
@@ -74,7 +69,7 @@ class FileUtilProxy {
// is set PLATFORM_FILE_OK.
// If the file hasn't existed but it couldn't be created for some other
// reasons, |created| is set false and |error code| indicates the error.
- typedef Callback2<base::PlatformFileError /* error code */,
+ typedef Callback2<PlatformFileError /* error code */,
bool /* created */>::Type EnsureFileExistsCallback;
static bool EnsureFileExists(
scoped_refptr<MessageLoopProxy> message_loop_proxy,
@@ -83,8 +78,8 @@ class FileUtilProxy {
// Retrieves the information about a file. It is invalid to pass NULL for the
// callback.
- typedef Callback2<base::PlatformFileError /* error code */,
- const base::PlatformFileInfo& /* file_info */
+ typedef Callback2<PlatformFileError /* error code */,
+ const PlatformFileInfo& /* file_info */
>::Type GetFileInfoCallback;
static bool GetFileInfo(
scoped_refptr<MessageLoopProxy> message_loop_proxy,
@@ -93,12 +88,11 @@ class FileUtilProxy {
static bool GetFileInfoFromPlatformFile(
scoped_refptr<MessageLoopProxy> message_loop_proxy,
- base::PlatformFile file,
+ PlatformFile file,
GetFileInfoCallback* callback);
- typedef Callback2<base::PlatformFileError /* error code */,
- const std::vector<base::file_util_proxy::Entry>&
- >::Type ReadDirectoryCallback;
+ typedef Callback2<PlatformFileError /* error code */,
+ const std::vector<Entry>&>::Type ReadDirectoryCallback;
static bool ReadDirectory(scoped_refptr<MessageLoopProxy> message_loop_proxy,
const FilePath& file_path,
ReadDirectoryCallback* callback);
@@ -148,11 +142,11 @@ class FileUtilProxy {
// Reads from a file. On success, the file pointer is moved to position
// |offset + bytes_to_read| in the file. The callback can be NULL.
- typedef Callback2<base::PlatformFileError /* error code */,
+ typedef Callback2<PlatformFileError /* error code */,
int /* bytes read/written */>::Type ReadWriteCallback;
static bool Read(
scoped_refptr<MessageLoopProxy> message_loop_proxy,
- base::PlatformFile file,
+ PlatformFile file,
int64 offset,
char* buffer,
int bytes_to_read,
@@ -163,7 +157,7 @@ class FileUtilProxy {
// |offset + bytes_to_write| in the file. The callback can be NULL.
static bool Write(
scoped_refptr<MessageLoopProxy> message_loop_proxy,
- base::PlatformFile file,
+ PlatformFile file,
int64 offset,
const char* buffer,
int bytes_to_write,
@@ -172,17 +166,17 @@ class FileUtilProxy {
// Touches a file. The callback can be NULL.
static bool Touch(
scoped_refptr<MessageLoopProxy> message_loop_proxy,
- base::PlatformFile file,
- const base::Time& last_access_time,
- const base::Time& last_modified_time,
+ PlatformFile file,
+ const Time& last_access_time,
+ const Time& last_modified_time,
StatusCallback* callback);
// Touches a file. The callback can be NULL.
static bool Touch(
scoped_refptr<MessageLoopProxy> message_loop_proxy,
const FilePath& file_path,
- const base::Time& last_access_time,
- const base::Time& last_modified_time,
+ const Time& last_access_time,
+ const Time& last_modified_time,
StatusCallback* callback);
// Truncates a file to the given length. If |length| is greater than the
@@ -190,7 +184,7 @@ class FileUtilProxy {
// The callback can be NULL.
static bool Truncate(
scoped_refptr<MessageLoopProxy> message_loop_proxy,
- base::PlatformFile file,
+ PlatformFile file,
int64 length,
StatusCallback* callback);
@@ -206,7 +200,7 @@ class FileUtilProxy {
// Flushes a file. The callback can be NULL.
static bool Flush(
scoped_refptr<MessageLoopProxy> message_loop_proxy,
- base::PlatformFile file,
+ PlatformFile file,
StatusCallback* callback);
private:
diff --git a/chrome/browser/file_system/browser_file_system_callback_dispatcher.cc b/chrome/browser/file_system/browser_file_system_callback_dispatcher.cc
index 756bef72aaf80a0bb741993668b467e6e27c713d..b95930f0dfb7ff02b97d401497711c13ed212517 100644
--- a/chrome/browser/file_system/browser_file_system_callback_dispatcher.cc
+++ b/chrome/browser/file_system/browser_file_system_callback_dispatcher.cc
@@ -29,7 +29,7 @@ void BrowserFileSystemCallbackDispatcher::DidReadMetadata(
}
void BrowserFileSystemCallbackDispatcher::DidReadDirectory(
- const std::vector<base::file_util_proxy::Entry>& entries, bool has_more) {
+ const std::vector<base::FileUtilProxy::Entry>& entries, bool has_more) {
dispatcher_host_->Send(new ViewMsg_FileSystem_DidReadDirectory(
request_id_, entries, has_more));
dispatcher_host_->RemoveCompletedOperation(request_id_);
diff --git a/chrome/browser/file_system/browser_file_system_callback_dispatcher.h b/chrome/browser/file_system/browser_file_system_callback_dispatcher.h
index 3220577f216cf894d343b8898c5809a6ad218126..7e85b41d73ce52163133ea193dfd12e7cc35af64 100644
--- a/chrome/browser/file_system/browser_file_system_callback_dispatcher.h
+++ b/chrome/browser/file_system/browser_file_system_callback_dispatcher.h
@@ -20,7 +20,7 @@ class BrowserFileSystemCallbackDispatcher
virtual void DidSucceed();
virtual void DidReadMetadata(const base::PlatformFileInfo& file_info);
virtual void DidReadDirectory(
- const std::vector<base::file_util_proxy::Entry>& entries,
+ const std::vector<base::FileUtilProxy::Entry>& entries,
bool has_more);
virtual void DidOpenFileSystem(const std::string& name,
const FilePath& root_path);
diff --git a/chrome/common/file_system/file_system_dispatcher.cc b/chrome/common/file_system/file_system_dispatcher.cc
index dfe23bf6147c504dd3944cdfff2f23a0a766de1f..e7c4e689abb86b6cf45b4312e7ea3003ec31e885 100644
--- a/chrome/common/file_system/file_system_dispatcher.cc
+++ b/chrome/common/file_system/file_system_dispatcher.cc
@@ -247,7 +247,7 @@ void FileSystemDispatcher::DidReadMetadata(
void FileSystemDispatcher::DidReadDirectory(
int request_id,
- const std::vector<base::file_util_proxy::Entry>& entries,
+ const std::vector<base::FileUtilProxy::Entry>& entries,
bool has_more) {
fileapi::FileSystemCallbackDispatcher* dispatcher =
dispatchers_.Lookup(request_id);
diff --git a/chrome/common/file_system/file_system_dispatcher.h b/chrome/common/file_system/file_system_dispatcher.h
index f256189ab8e3b78ef645f4d59317316b83f1fd57..21b2184357cd074bba42013e8230e1dccc1f8cfc 100644
--- a/chrome/common/file_system/file_system_dispatcher.h
+++ b/chrome/common/file_system/file_system_dispatcher.h
@@ -87,7 +87,7 @@ class FileSystemDispatcher {
const base::PlatformFileInfo& file_info);
void DidReadDirectory(
int request_id,
- const std::vector<base::file_util_proxy::Entry>& entries,
+ const std::vector<base::FileUtilProxy::Entry>& entries,
bool has_more);
void DidFail(int request_id, base::PlatformFileError error_code);
void DidWrite(int request_id, int64 bytes, bool complete);
diff --git a/chrome/common/file_system/webfilesystem_callback_dispatcher.cc b/chrome/common/file_system/webfilesystem_callback_dispatcher.cc
index bf8d901ab509972a7ad8dc8a4e5a03915556482e..6d779a251d3b7dcebab04244a421835c56aa2833 100644
--- a/chrome/common/file_system/webfilesystem_callback_dispatcher.cc
+++ b/chrome/common/file_system/webfilesystem_callback_dispatcher.cc
@@ -41,7 +41,7 @@ void WebFileSystemCallbackDispatcher::DidReadMetadata(
}
void WebFileSystemCallbackDispatcher::DidReadDirectory(
- const std::vector<base::file_util_proxy::Entry>& entries, bool has_more) {
+ const std::vector<base::FileUtilProxy::Entry>& entries, bool has_more) {
WebVector<WebFileSystemEntry> file_system_entries(entries.size());
for (size_t i = 0; i < entries.size(); i++) {
file_system_entries[i].name =
diff --git a/chrome/common/file_system/webfilesystem_callback_dispatcher.h b/chrome/common/file_system/webfilesystem_callback_dispatcher.h
index 075d5bb977705d3d42ca1f68625ace03a2c4cc1c..dc570fa007f6a13ef556e63eb14670827607be0d 100644
--- a/chrome/common/file_system/webfilesystem_callback_dispatcher.h
+++ b/chrome/common/file_system/webfilesystem_callback_dispatcher.h
@@ -9,12 +9,6 @@
#include "base/platform_file.h"
#include "webkit/fileapi/file_system_callback_dispatcher.h"
-namespace base {
-namespace file_util_proxy {
-struct Entry;
-}
-}
-
namespace WebKit {
class WebFileSystemCallbacks;
}
@@ -29,7 +23,7 @@ class WebFileSystemCallbackDispatcher
virtual void DidSucceed();
virtual void DidReadMetadata(const base::PlatformFileInfo& file_info);
virtual void DidReadDirectory(
- const std::vector<base::file_util_proxy::Entry>& entries,
+ const std::vector<base::FileUtilProxy::Entry>& entries,
bool has_more);
virtual void DidOpenFileSystem(const std::string&,
const FilePath&);
diff --git a/chrome/common/file_system/webfilewriter_impl.cc b/chrome/common/file_system/webfilewriter_impl.cc
index 2f3677b18aff4838981dff6df4a8afc51bacd2a0..7fc2656c0e9ebfcd7e6b2295630ccbdcf758066a 100644
--- a/chrome/common/file_system/webfilewriter_impl.cc
+++ b/chrome/common/file_system/webfilewriter_impl.cc
@@ -12,7 +12,6 @@ namespace {
inline FileSystemDispatcher* GetFileSystemDispatcher() {
return ChildThread::current()->file_system_dispatcher();
}
-
}
class WebFileWriterImpl::CallbackDispatcher
@@ -28,7 +27,7 @@ class WebFileWriterImpl::CallbackDispatcher
NOTREACHED();
}
virtual void DidReadDirectory(
- const std::vector<base::file_util_proxy::Entry>& entries,
+ const std::vector<base::FileUtilProxy::Entry>& entries,
bool has_more) {
NOTREACHED();
}
@@ -78,4 +77,3 @@ void WebFileWriterImpl::DoCancel() {
GetFileSystemDispatcher()->Cancel(request_id_,
new CallbackDispatcher(AsWeakPtr()));
}
-
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index 9abd695dd34e4bafd275f39ecdf0e50e5d27b062..14a8a8a3a17930ba8cecdfcdcf2a2995d904c839 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -13,6 +13,7 @@
#include "build/build_config.h"
#include "base/file_path.h"
+#include "base/file_util_proxy.h"
#include "base/nullable_string16.h"
#include "base/platform_file.h"
#include "base/sync_socket.h"
@@ -50,12 +51,6 @@ class SkBitmap;
struct ThumbnailScore;
class WebCursor;
-namespace base {
-namespace file_util_proxy {
-struct Entry;
-}
-}
-
namespace gfx {
class Rect;
}
@@ -1095,7 +1090,7 @@ IPC_BEGIN_MESSAGES(View)
base::PlatformFileInfo)
IPC_MESSAGE_CONTROL3(ViewMsg_FileSystem_DidReadDirectory,
int /* request_id */,
- std::vector<base::file_util_proxy::Entry> /* entries */,
+ std::vector<base::FileUtilProxy::Entry> /* entries */,
bool /* has_more */)
IPC_MESSAGE_CONTROL3(ViewMsg_FileSystem_DidWrite,
diff --git a/chrome/common/render_messages_params.cc b/chrome/common/render_messages_params.cc
index 63c37f8b7ecd86928b1c7452df0b5bb28f1ca36e..a57b076439bca112aaa16a7d629e7e52585f6a3e 100644
--- a/chrome/common/render_messages_params.cc
+++ b/chrome/common/render_messages_params.cc
@@ -1873,14 +1873,14 @@ void ParamTraits<ViewHostMsg_DomMessage_Params>::Log(const param_type& p,
l->append(")");
}
-void ParamTraits<base::file_util_proxy::Entry>::Write(
+void ParamTraits<base::FileUtilProxy::Entry>::Write(
Message* m,
const param_type& p) {
WriteParam(m, p.name);
WriteParam(m, p.is_directory);
}
-bool ParamTraits<base::file_util_proxy::Entry>::Read(
+bool ParamTraits<base::FileUtilProxy::Entry>::Read(
const Message* m,
void** iter,
param_type* p) {
@@ -1889,7 +1889,7 @@ bool ParamTraits<base::file_util_proxy::Entry>::Read(
ReadParam(m, iter, &p->is_directory);
}
-void ParamTraits<base::file_util_proxy::Entry>::Log(
+void ParamTraits<base::FileUtilProxy::Entry>::Log(
const param_type& p,
std::string* l) {
l->append("(");
diff --git a/chrome/common/render_messages_params.h b/chrome/common/render_messages_params.h
index 2eeff7075862e0aab4c24df2351b736ca06d5dea..d92def3b1d6bcb7786934e344ced3517ba387954 100644
--- a/chrome/common/render_messages_params.h
+++ b/chrome/common/render_messages_params.h
@@ -1315,8 +1315,8 @@ struct ParamTraits<ViewHostMsg_DomMessage_Params> {
};
template <>
-struct ParamTraits<base::file_util_proxy::Entry> {
- typedef base::file_util_proxy::Entry param_type;
+struct ParamTraits<base::FileUtilProxy::Entry> {
+ typedef base::FileUtilProxy::Entry param_type;
static void Write(Message* m, const param_type& p);
static bool Read(const Message* m, void** iter, param_type* p);
static void Log(const param_type& p, std::string* l);
diff --git a/webkit/fileapi/file_system_callback_dispatcher.h b/webkit/fileapi/file_system_callback_dispatcher.h
index ea7c4425c3ae3acb8a59593d749b6602459c2682..0b4c25b8e499fba8ced2a91e56874ffc2ce35553 100644
--- a/webkit/fileapi/file_system_callback_dispatcher.h
+++ b/webkit/fileapi/file_system_callback_dispatcher.h
@@ -33,7 +33,7 @@ class FileSystemCallbackDispatcher {
// all contents (the subsets reported in any two calls are disjoint), and
// |has_more| will be true, except for the last chunk.
virtual void DidReadDirectory(
- const std::vector<base::file_util_proxy::Entry>& entries,
+ const std::vector<base::FileUtilProxy::Entry>& entries,
bool has_more) = 0;
// Callback for opening a file system. Called with a name and root path for
@@ -48,6 +48,6 @@ class FileSystemCallbackDispatcher {
virtual void DidWrite(int64 bytes, bool complete) = 0;
};
-} // namespace fileapi
+} // namespace fileapi
-#endif // WEBKIT_FILEAPI_FILE_SYSTEM_CALLBACK_DISPATCHER_H_
+#endif // WEBKIT_FILEAPI_FILE_SYSTEM_CALLBACK_DISPATCHER_H_
diff --git a/webkit/fileapi/file_system_operation.cc b/webkit/fileapi/file_system_operation.cc
index 0e2e823603ffadaf6ca2635d1102a75e739711be..fe077581fb7a4d3ad4da81370ffce8696da61471 100644
--- a/webkit/fileapi/file_system_operation.cc
+++ b/webkit/fileapi/file_system_operation.cc
@@ -256,8 +256,9 @@ void FileSystemOperation::DidDirectoryExists(
dispatcher_->DidSucceed();
else
dispatcher_->DidFail(base::PLATFORM_FILE_ERROR_FAILED);
- } else
+ } else {
dispatcher_->DidFail(rv);
+ }
}
void FileSystemOperation::DidFileExists(
@@ -268,8 +269,9 @@ void FileSystemOperation::DidFileExists(
dispatcher_->DidFail(base::PLATFORM_FILE_ERROR_FAILED);
else
dispatcher_->DidSucceed();
- } else
+ } else {
dispatcher_->DidFail(rv);
+ }
}
void FileSystemOperation::DidGetMetadata(
@@ -283,7 +285,7 @@ void FileSystemOperation::DidGetMetadata(
void FileSystemOperation::DidReadDirectory(
base::PlatformFileError rv,
- const std::vector<base::file_util_proxy::Entry>& entries) {
+ const std::vector<base::FileUtilProxy::Entry>& entries) {
if (rv == base::PLATFORM_FILE_OK)
dispatcher_->DidReadDirectory(entries, false /* has_more */);
else
diff --git a/webkit/fileapi/file_system_operation.h b/webkit/fileapi/file_system_operation.h
index 6b4599a92b844aa3f5e72410bd6bf9b1fa34fabf..d76513f37ead22a8934f8477192cb9fce0ae8267 100644
--- a/webkit/fileapi/file_system_operation.h
+++ b/webkit/fileapi/file_system_operation.h
@@ -104,7 +104,7 @@ class FileSystemOperation {
void DidReadDirectory(
base::PlatformFileError rv,
- const std::vector<base::file_util_proxy::Entry>& entries);
+ const std::vector<base::FileUtilProxy::Entry>& entries);
void DidWrite(
base::PlatformFileError rv,
diff --git a/webkit/fileapi/file_system_operation_unittest.cc b/webkit/fileapi/file_system_operation_unittest.cc
index fb300bf573758f0b97701a8eae7ac87a387d2c4f..370d95c1198842a5aa479cc1d1219e6b729ab9fa 100644
--- a/webkit/fileapi/file_system_operation_unittest.cc
+++ b/webkit/fileapi/file_system_operation_unittest.cc
@@ -45,7 +45,7 @@ class MockDispatcher : public FileSystemCallbackDispatcher {
}
virtual void DidReadDirectory(
- const std::vector<base::file_util_proxy::Entry>& entries,
+ const std::vector<base::FileUtilProxy::Entry>& entries,
bool /* has_more */) {
entries_ = entries;
}
@@ -62,7 +62,7 @@ class MockDispatcher : public FileSystemCallbackDispatcher {
int status() const { return status_; }
int request_id() const { return request_id_; }
const base::PlatformFileInfo& info() const { return info_; }
- const std::vector<base::file_util_proxy::Entry>& entries() const {
+ const std::vector<base::FileUtilProxy::Entry>& entries() const {
return entries_;
}
@@ -70,7 +70,7 @@ class MockDispatcher : public FileSystemCallbackDispatcher {
int status_;
int request_id_;
base::PlatformFileInfo info_;
- std::vector<base::file_util_proxy::Entry> entries_;
+ std::vector<base::FileUtilProxy::Entry> entries_;
};
class FileSystemOperationTest : public testing::Test {
diff --git a/webkit/glue/plugins/pepper_file_callbacks.cc b/webkit/glue/plugins/pepper_file_callbacks.cc
index e07b2b54ea9ef88538547e8d5ac3c6b1ea0691df..fe6ad95ea3752ab416445049627a8a7b41ed694c 100644
--- a/webkit/glue/plugins/pepper_file_callbacks.cc
+++ b/webkit/glue/plugins/pepper_file_callbacks.cc
@@ -55,7 +55,7 @@ void FileCallbacks::DidReadMetadata(
}
void FileCallbacks::DidReadDirectory(
- const std::vector<base::file_util_proxy::Entry>&, bool) {
+ const std::vector<base::FileUtilProxy::Entry>&, bool) {
NOTREACHED();
}
diff --git a/webkit/glue/plugins/pepper_file_callbacks.h b/webkit/glue/plugins/pepper_file_callbacks.h
index 41f0b8fe40957e04e49280eb261be1a0172c5e27..20cb8d33ca8239a55914e0de660ca8f50fdb540e 100644
--- a/webkit/glue/plugins/pepper_file_callbacks.h
+++ b/webkit/glue/plugins/pepper_file_callbacks.h
@@ -34,7 +34,7 @@ class FileCallbacks : public fileapi::FileSystemCallbackDispatcher {
virtual void DidSucceed();
virtual void DidReadMetadata(const base::PlatformFileInfo& file_info);
virtual void DidReadDirectory(
- const std::vector<base::file_util_proxy::Entry>&, bool);
+ const std::vector<base::FileUtilProxy::Entry>&, bool);
virtual void DidOpenFileSystem(const std::string&,
const FilePath& root_path);
virtual void DidFail(base::PlatformFileError error_code);
diff --git a/webkit/tools/test_shell/simple_file_system.cc b/webkit/tools/test_shell/simple_file_system.cc
index ae77ce463e621cb0d40635a86f01768bfd3d694e..563ff345c2aeb02967e5fed6984ee898bb127c94 100644
--- a/webkit/tools/test_shell/simple_file_system.cc
+++ b/webkit/tools/test_shell/simple_file_system.cc
@@ -73,10 +73,10 @@ class TestShellFileSystemCallbackDispatcher
}
virtual void DidReadDirectory(
- const std::vector<base::file_util_proxy::Entry>& entries,
+ const std::vector<base::FileUtilProxy::Entry>& entries,
bool has_more) {
std::vector<WebFileSystemEntry> web_entries_vector;
- for (std::vector<base::file_util_proxy::Entry>::const_iterator it =
+ for (std::vector<base::FileUtilProxy::Entry>::const_iterator it =
entries.begin(); it != entries.end(); ++it) {
WebFileSystemEntry entry;
entry.name = webkit_glue::FilePathStringToWebString(it->name);
diff --git a/webkit/tools/test_shell/simple_file_writer.cc b/webkit/tools/test_shell/simple_file_writer.cc
index 0c1a43431b979410bdc8f763c1cd13fed629e0b1..bb4758f3f5323aadaf36b050b74abc7070e60032 100644
--- a/webkit/tools/test_shell/simple_file_writer.cc
+++ b/webkit/tools/test_shell/simple_file_writer.cc
@@ -99,7 +99,7 @@ class SimpleFileWriter::IOThreadProxy
}
virtual void DidReadDirectory(
- const std::vector<base::file_util_proxy::Entry>& entries,
+ const std::vector<base::FileUtilProxy::Entry>& entries,
bool has_more) {
NOTREACHED();
}