summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorkerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-20 22:19:17 +0000
committerkerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-20 22:19:17 +0000
commiteeed85c4662942e0c9e557d36fa0d26a938058e5 (patch)
tree3e6e267779cd0de15b1dfb8543e399023a4b1342 /webkit/tools
parentfe2534f1d0294dadd3bc915982ef378906a2be57 (diff)
downloadchromium_src-eeed85c4662942e0c9e557d36fa0d26a938058e5.zip
chromium_src-eeed85c4662942e0c9e557d36fa0d26a938058e5.tar.gz
chromium_src-eeed85c4662942e0c9e557d36fa0d26a938058e5.tar.bz2
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
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/simple_file_system.cc8
-rw-r--r--webkit/tools/test_shell/simple_file_writer.cc4
-rw-r--r--webkit/tools/test_shell/simple_resource_loader_bridge.cc4
3 files changed, 13 insertions, 3 deletions
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());
}