| Index: webkit/fileapi/local_file_system_test_helper.cc
|
| diff --git a/webkit/fileapi/local_file_system_test_helper.cc b/webkit/fileapi/local_file_system_test_helper.cc
|
| index 2de3aca3d867334bb2a3a7c19b8ea812cd6accd1..3fae10ded5d8450a8a90e667b95f28ca80034f90 100644
|
| --- a/webkit/fileapi/local_file_system_test_helper.cc
|
| +++ b/webkit/fileapi/local_file_system_test_helper.cc
|
| @@ -52,8 +52,8 @@ void LocalFileSystemTestOriginHelper::SetUp(
|
|
|
| // Prepare the origin's root directory.
|
| file_system_context_->GetMountPointProvider(type_)->
|
| - GetFileSystemRootPathOnFileThread(
|
| - FileSystemURL(origin_, type_, FilePath()), true /* create */);
|
| + GetFileSystemRootPathOnFileThread(CreateURL(FilePath()),
|
| + true /* create */);
|
|
|
| // Initialize the usage cache file.
|
| FilePath usage_cache_path = GetUsageCachePath();
|
| @@ -87,8 +87,8 @@ void LocalFileSystemTestOriginHelper::SetUp(
|
| // Prepare the origin's root directory.
|
| FileSystemMountPointProvider* mount_point_provider =
|
| file_system_context_->GetMountPointProvider(type_);
|
| - mount_point_provider->GetFileSystemRootPathOnFileThread(
|
| - FileSystemURL(origin_, type_, FilePath()), true /* create */);
|
| + mount_point_provider->GetFileSystemRootPathOnFileThread(CreateURL(FilePath()),
|
| + true /* create */);
|
|
|
| if (file_util)
|
| file_util_ = file_util;
|
| @@ -110,8 +110,7 @@ void LocalFileSystemTestOriginHelper::TearDown() {
|
|
|
| FilePath LocalFileSystemTestOriginHelper::GetOriginRootPath() const {
|
| return file_system_context_->GetMountPointProvider(type_)->
|
| - GetFileSystemRootPathOnFileThread(
|
| - FileSystemURL(origin_, type_, FilePath()), false);
|
| + GetFileSystemRootPathOnFileThread(CreateURL(FilePath()), false);
|
| }
|
|
|
| FilePath LocalFileSystemTestOriginHelper::GetLocalPath(const FilePath& path) {
|
| @@ -137,7 +136,7 @@ FilePath LocalFileSystemTestOriginHelper::GetUsageCachePath() const {
|
|
|
| FileSystemURL LocalFileSystemTestOriginHelper::CreateURL(const FilePath& path)
|
| const {
|
| - return FileSystemURL(origin_, type_, path);
|
| + return file_system_context_->CreateCrackedFileSystemURL(origin_, type_, path);
|
| }
|
|
|
| base::PlatformFileError LocalFileSystemTestOriginHelper::SameFileUtilCopy(
|
|
|