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 d2055d88bb82f48c3f4a1fedd05e07c28754a341..35cbcf37e4eecf17250468d64bddaa685911b719 100644 |
--- a/webkit/fileapi/isolated_mount_point_provider.cc |
+++ b/webkit/fileapi/isolated_mount_point_provider.cc |
@@ -69,10 +69,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( |
@@ -81,9 +82,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( |
@@ -98,8 +99,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; |
} |