Index: content/public/test/sandbox_file_system_test_helper.cc |
diff --git a/content/public/test/sandbox_file_system_test_helper.cc b/content/public/test/sandbox_file_system_test_helper.cc |
index d3176b270c483896cb9c6ce33369123807bd10e5..1e294b785fb019abd15e98d4de3866cb70e4baf9 100644 |
--- a/content/public/test/sandbox_file_system_test_helper.cc |
+++ b/content/public/test/sandbox_file_system_test_helper.cc |
@@ -19,7 +19,13 @@ |
#include "webkit/browser/quota/mock_special_storage_policy.h" |
#include "webkit/common/fileapi/file_system_util.h" |
-namespace fileapi { |
+using fileapi::FileSystemContext; |
+using fileapi::FileSystemOperationContext; |
+using fileapi::FileSystemOperationRunner; |
+using fileapi::FileSystemType; |
+using fileapi::FileSystemURL; |
+ |
+namespace content { |
SandboxFileSystemTestHelper::SandboxFileSystemTestHelper( |
const GURL& origin, FileSystemType type) |
@@ -28,7 +34,7 @@ SandboxFileSystemTestHelper::SandboxFileSystemTestHelper( |
SandboxFileSystemTestHelper::SandboxFileSystemTestHelper() |
: origin_(GURL("http://foo.com")), |
- type_(kFileSystemTypeTemporary), |
+ type_(fileapi::kFileSystemTypeTemporary), |
file_util_(NULL) { |
} |
@@ -99,7 +105,7 @@ int64 SandboxFileSystemTestHelper::ComputeCurrentOriginUsage() { |
usage_cache()->CloseCacheFiles(); |
int64 size = base::ComputeDirectorySize(GetOriginRootPath()); |
if (base::PathExists(GetUsageCachePath())) |
- size -= FileSystemUsageCache::kUsageFileSize; |
+ size -= fileapi::FileSystemUsageCache::kUsageFileSize; |
return size; |
} |
@@ -124,12 +130,12 @@ SandboxFileSystemTestHelper::NewOperationContext() { |
} |
void SandboxFileSystemTestHelper::AddFileChangeObserver( |
- FileChangeObserver* observer) { |
+ fileapi::FileChangeObserver* observer) { |
file_system_context_->sandbox_backend()->GetQuotaUtil()-> |
AddFileChangeObserver(type_, observer, NULL); |
} |
-FileSystemUsageCache* SandboxFileSystemTestHelper::usage_cache() { |
+fileapi::FileSystemUsageCache* SandboxFileSystemTestHelper::usage_cache() { |
return file_system_context()->sandbox_delegate()->usage_cache(); |
} |
@@ -150,4 +156,4 @@ void SandboxFileSystemTestHelper::SetUpFileSystem() { |
usage_cache()->UpdateUsage(usage_cache_path, 0); |
} |
-} // namespace fileapi |
+} // namespace content |