From eeed85c4662942e0c9e557d36fa0d26a938058e5 Mon Sep 17 00:00:00 2001 From: "kerz@chromium.org" Date: Wed, 20 Apr 2011 22:19:17 +0000 Subject: Merge 82266 - Fixed file/directory url resolution for external mount point provider.Per Eric's request, refactored FileSystemDirURLRequestJob and FileSystemURLRequestJob classes to resolve local file system through a new operation.BUG=chromium-os:14225TEST=added new test cases to FileSystemPathManagerTest.*, added FileSystemOperationTest.TestGetLocalFilePathSuccessReview URL: http://codereview.chromium.org/6864040 TBR=zelidrag@chromium.org Review URL: http://codereview.chromium.org/6882102 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@82372 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/tools/test_shell/simple_file_system.cc | 8 +++++++- webkit/tools/test_shell/simple_file_writer.cc | 4 ++++ webkit/tools/test_shell/simple_resource_loader_bridge.cc | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) (limited to 'webkit/tools') diff --git a/webkit/tools/test_shell/simple_file_system.cc b/webkit/tools/test_shell/simple_file_system.cc index 6baa1a9..e5959ce 100644 --- a/webkit/tools/test_shell/simple_file_system.cc +++ b/webkit/tools/test_shell/simple_file_system.cc @@ -64,6 +64,11 @@ class SimpleFileSystemCallbackDispatcher callbacks_->didSucceed(); } + // Callback to report information for a file. + virtual void DidGetLocalPath(const FilePath& local_path) { + NOTREACHED(); + } + virtual void DidReadMetadata(const base::PlatformFileInfo& info, const FilePath& platform_path) { DCHECK(file_system_); @@ -130,7 +135,8 @@ SimpleFileSystem::SimpleFileSystem() { file_system_dir_.path(), false /* incognito */, true /* allow_file_access */, - true /* unlimited_quota */); + true /* unlimited_quota */, + NULL); } else { LOG(WARNING) << "Failed to create a temp dir for the filesystem." "FileSystem feature will be disabled."; diff --git a/webkit/tools/test_shell/simple_file_writer.cc b/webkit/tools/test_shell/simple_file_writer.cc index 657d247..bd9b282 100644 --- a/webkit/tools/test_shell/simple_file_writer.cc +++ b/webkit/tools/test_shell/simple_file_writer.cc @@ -96,6 +96,10 @@ class SimpleFileWriter::IOThreadProxy proxy_->DidSucceed(); } + virtual void DidGetLocalPath(const FilePath& local_path) { + NOTREACHED(); + } + virtual void DidFail(base::PlatformFileError error_code) { proxy_->DidFail(error_code); } diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc index ea2a78b..c8755d5 100644 --- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc +++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc @@ -127,12 +127,12 @@ net::URLRequestJob* FileSystemURLRequestJobFactory(net::URLRequest* request, if (!path.empty() && path[path.size() - 1] == '/') { return new fileapi::FileSystemDirURLRequestJob( request, - fs_context->path_manager(), + fs_context, SimpleResourceLoaderBridge::GetIoThread()); } return new fileapi::FileSystemURLRequestJob( request, - fs_context->path_manager(), + fs_context, SimpleResourceLoaderBridge::GetIoThread()); } -- cgit v1.1