| 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 e3dbe612c4fe9882ef62ffbf5233e51c6eec2e27..fe206f1641fe6f5984a5e824a116c32961e3fea6 100644
|
| --- a/webkit/fileapi/local_file_system_test_helper.cc
|
| +++ b/webkit/fileapi/local_file_system_test_helper.cc
|
| @@ -38,7 +38,7 @@ LocalFileSystemTestOriginHelper::LocalFileSystemTestOriginHelper()
|
| LocalFileSystemTestOriginHelper::~LocalFileSystemTestOriginHelper() {
|
| }
|
|
|
| -void LocalFileSystemTestOriginHelper::SetUp(const FilePath& base_dir) {
|
| +void LocalFileSystemTestOriginHelper::SetUp(const base::FilePath& base_dir) {
|
| SetUp(base_dir, false, NULL);
|
| }
|
|
|
| @@ -50,17 +50,17 @@ void LocalFileSystemTestOriginHelper::SetUp(
|
|
|
| // Prepare the origin's root directory.
|
| file_system_context_->GetMountPointProvider(type_)->
|
| - GetFileSystemRootPathOnFileThread(CreateURL(FilePath()),
|
| + GetFileSystemRootPathOnFileThread(CreateURL(base::FilePath()),
|
| true /* create */);
|
|
|
| // Initialize the usage cache file.
|
| - FilePath usage_cache_path = GetUsageCachePath();
|
| + base::FilePath usage_cache_path = GetUsageCachePath();
|
| if (!usage_cache_path.empty())
|
| FileSystemUsageCache::UpdateUsage(usage_cache_path, 0);
|
| }
|
|
|
| void LocalFileSystemTestOriginHelper::SetUp(
|
| - const FilePath& base_dir,
|
| + const base::FilePath& base_dir,
|
| bool unlimited_quota,
|
| quota::QuotaManagerProxy* quota_manager_proxy) {
|
| scoped_refptr<quota::MockSpecialStoragePolicy> special_storage_policy =
|
| @@ -79,11 +79,11 @@ void LocalFileSystemTestOriginHelper::SetUp(
|
| // Prepare the origin's root directory.
|
| FileSystemMountPointProvider* mount_point_provider =
|
| file_system_context_->GetMountPointProvider(type_);
|
| - mount_point_provider->GetFileSystemRootPathOnFileThread(CreateURL(FilePath()),
|
| + mount_point_provider->GetFileSystemRootPathOnFileThread(CreateURL(base::FilePath()),
|
| true /* create */);
|
|
|
| // Initialize the usage cache file.
|
| - FilePath usage_cache_path = GetUsageCachePath();
|
| + base::FilePath usage_cache_path = GetUsageCachePath();
|
| if (!usage_cache_path.empty())
|
| FileSystemUsageCache::UpdateUsage(usage_cache_path, 0);
|
| }
|
| @@ -93,33 +93,33 @@ void LocalFileSystemTestOriginHelper::TearDown() {
|
| MessageLoop::current()->RunUntilIdle();
|
| }
|
|
|
| -FilePath LocalFileSystemTestOriginHelper::GetOriginRootPath() const {
|
| +base::FilePath LocalFileSystemTestOriginHelper::GetOriginRootPath() const {
|
| return file_system_context_->GetMountPointProvider(type_)->
|
| - GetFileSystemRootPathOnFileThread(CreateURL(FilePath()), false);
|
| + GetFileSystemRootPathOnFileThread(CreateURL(base::FilePath()), false);
|
| }
|
|
|
| -FilePath LocalFileSystemTestOriginHelper::GetLocalPath(const FilePath& path) {
|
| +base::FilePath LocalFileSystemTestOriginHelper::GetLocalPath(const base::FilePath& path) {
|
| DCHECK(file_util_);
|
| - FilePath local_path;
|
| + base::FilePath local_path;
|
| scoped_ptr<FileSystemOperationContext> context(NewOperationContext());
|
| file_util_->GetLocalFilePath(context.get(), CreateURL(path), &local_path);
|
| return local_path;
|
| }
|
|
|
| -FilePath LocalFileSystemTestOriginHelper::GetLocalPathFromASCII(
|
| +base::FilePath LocalFileSystemTestOriginHelper::GetLocalPathFromASCII(
|
| const std::string& path) {
|
| - return GetLocalPath(FilePath().AppendASCII(path));
|
| + return GetLocalPath(base::FilePath().AppendASCII(path));
|
| }
|
|
|
| -FilePath LocalFileSystemTestOriginHelper::GetUsageCachePath() const {
|
| +base::FilePath LocalFileSystemTestOriginHelper::GetUsageCachePath() const {
|
| if (type_ != kFileSystemTypeTemporary &&
|
| type_ != kFileSystemTypePersistent)
|
| - return FilePath();
|
| + return base::FilePath();
|
| return file_system_context_->
|
| sandbox_provider()->GetUsageCachePathForOriginAndType(origin_, type_);
|
| }
|
|
|
| -FileSystemURL LocalFileSystemTestOriginHelper::CreateURL(const FilePath& path)
|
| +FileSystemURL LocalFileSystemTestOriginHelper::CreateURL(const base::FilePath& path)
|
| const {
|
| return file_system_context_->CreateCrackedFileSystemURL(origin_, type_, path);
|
| }
|
| @@ -163,7 +163,7 @@ LocalFileSystemOperation* LocalFileSystemTestOriginHelper::NewOperation() {
|
| NewOperationContext());
|
| LocalFileSystemOperation* operation = static_cast<LocalFileSystemOperation*>(
|
| file_system_context_->CreateFileSystemOperation(
|
| - CreateURL(FilePath()), NULL));
|
| + CreateURL(base::FilePath()), NULL));
|
| return operation;
|
| }
|
|
|
|
|