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

1 files changed, 4 insertions, 0 deletions

diff --git a/webkit/fileapi/file_system_operation.h b/webkit/fileapi/file_system_operation.h
index c726403..654b596 100644
--- a/webkit/fileapi/file_system_operation.h
+++ b/webkit/fileapi/file_system_operation.h
@@ -84,6 +84,7 @@ class FileSystemOperation {
       const GURL& path,
       int file_flags,
       base::ProcessHandle peer_handle);
+  void GetLocalPath(const GURL& path);
 
   // Try to cancel the current operation [we support cancelling write or
   // truncate only].  Report failure for the current operation, then tell the
@@ -138,6 +139,8 @@ class FileSystemOperation {
       base::PlatformFileError rv,
       base::PassPlatformFile file,
       bool created);
+  void DidGetLocalPath(base::PlatformFileError rv,
+                       const FilePath& local_path);
 
   // Helper for Write().
   void OnFileOpenedForWrite(
@@ -194,6 +197,7 @@ class FileSystemOperation {
     kOperationTruncate,
     kOperationTouchFile,
     kOperationOpenFile,
+    kOperationGetLocalPath,
     kOperationCancel,
   };