| Index: webkit/fileapi/isolated_mount_point_provider.cc
|
| diff --git a/webkit/fileapi/isolated_mount_point_provider.cc b/webkit/fileapi/isolated_mount_point_provider.cc
|
| index 537885ecf8567662d96645b88f294d3073e007c5..5b070a4e7e6900feeca0df9c81d3bbda44300896 100644
|
| --- a/webkit/fileapi/isolated_mount_point_provider.cc
|
| +++ b/webkit/fileapi/isolated_mount_point_provider.cc
|
| @@ -71,10 +71,11 @@ FilePath IsolatedMountPointProvider::GetFileSystemRootPathOnFileThread(
|
| if (create || type != kFileSystemTypeIsolated)
|
| return FilePath();
|
| std::string fsid;
|
| - FilePath root, path;
|
| + FilePath path;
|
| + IsolatedContext::FileInfo root;
|
| if (!isolated_context()->CrackIsolatedPath(virtual_path, &fsid, &root, &path))
|
| return FilePath();
|
| - return root;
|
| + return root.path;
|
| }
|
|
|
| bool IsolatedMountPointProvider::IsAccessAllowed(
|
| @@ -83,9 +84,9 @@ bool IsolatedMountPointProvider::IsAccessAllowed(
|
| return false;
|
|
|
| std::string filesystem_id;
|
| - FilePath root, path;
|
| + FilePath path;
|
| return isolated_context()->CrackIsolatedPath(
|
| - virtual_path, &filesystem_id, &root, &path);
|
| + virtual_path, &filesystem_id, NULL, &path);
|
| }
|
|
|
| bool IsolatedMountPointProvider::IsRestrictedFileName(
|
| @@ -100,8 +101,8 @@ FileSystemFileUtil* IsolatedMountPointProvider::GetFileUtil() {
|
| FilePath IsolatedMountPointProvider::GetPathForPermissionsCheck(
|
| const FilePath& virtual_path) const {
|
| std::string fsid;
|
| - FilePath root, path;
|
| - if (!isolated_context()->CrackIsolatedPath(virtual_path, &fsid, &root, &path))
|
| + FilePath path;
|
| + if (!isolated_context()->CrackIsolatedPath(virtual_path, &fsid, NULL, &path))
|
| return FilePath();
|
| return path;
|
| }
|
|
|