Change fileapi namespace to content for test files that are moved under content/
Note that this temporarily adds some content:: notion in webkit/ (mostly for friend'ing / forward decls)
This also includes some refactoring in some test code (namely obfuscated_file_util_unittest.cc) to work around
cross-namespace friend'ing.
BUG=265769
TEST=build
TBR=mmenke
Review URL: https://codereview.chromium.org/137923003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245232 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/public/test/test_file_system_backend.h b/content/public/test/test_file_system_backend.h
index be7f9f7..4b49747f 100644
--- a/content/public/test/test_file_system_backend.h
+++ b/content/public/test/test_file_system_backend.h
@@ -17,14 +17,16 @@
}
namespace fileapi {
-
class AsyncFileUtilAdapter;
class FileSystemQuotaUtil;
+}
+
+namespace content {
// This should be only used for testing.
// This file system backend uses LocalFileUtil and stores data file
// under the given directory.
-class TestFileSystemBackend : public FileSystemBackend {
+class TestFileSystemBackend : public fileapi::FileSystemBackend {
public:
TestFileSystemBackend(
base::SequencedTaskRunner* task_runner,
@@ -32,39 +34,42 @@
virtual ~TestFileSystemBackend();
// FileSystemBackend implementation.
- virtual bool CanHandleType(FileSystemType type) const OVERRIDE;
- virtual void Initialize(FileSystemContext* context) OVERRIDE;
+ virtual bool CanHandleType(fileapi::FileSystemType type) const OVERRIDE;
+ virtual void Initialize(fileapi::FileSystemContext* context) OVERRIDE;
virtual void OpenFileSystem(
const GURL& origin_url,
- FileSystemType type,
- OpenFileSystemMode mode,
+ fileapi::FileSystemType type,
+ fileapi::OpenFileSystemMode mode,
const OpenFileSystemCallback& callback) OVERRIDE;
- virtual AsyncFileUtil* GetAsyncFileUtil(FileSystemType type) OVERRIDE;
- virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory(
- FileSystemType type,
+ virtual fileapi::AsyncFileUtil* GetAsyncFileUtil(
+ fileapi::FileSystemType type) OVERRIDE;
+ virtual fileapi::CopyOrMoveFileValidatorFactory*
+ GetCopyOrMoveFileValidatorFactory(
+ fileapi::FileSystemType type,
base::PlatformFileError* error_code) OVERRIDE;
- virtual FileSystemOperation* CreateFileSystemOperation(
- const FileSystemURL& url,
- FileSystemContext* context,
+ virtual fileapi::FileSystemOperation* CreateFileSystemOperation(
+ const fileapi::FileSystemURL& url,
+ fileapi::FileSystemContext* context,
base::PlatformFileError* error_code) const OVERRIDE;
virtual scoped_ptr<webkit_blob::FileStreamReader> CreateFileStreamReader(
- const FileSystemURL& url,
+ const fileapi::FileSystemURL& url,
int64 offset,
const base::Time& expected_modification_time,
- FileSystemContext* context) const OVERRIDE;
- virtual scoped_ptr<FileStreamWriter> CreateFileStreamWriter(
- const FileSystemURL& url,
+ fileapi::FileSystemContext* context) const OVERRIDE;
+ virtual scoped_ptr<fileapi::FileStreamWriter> CreateFileStreamWriter(
+ const fileapi::FileSystemURL& url,
int64 offset,
- FileSystemContext* context) const OVERRIDE;
- virtual FileSystemQuotaUtil* GetQuotaUtil() OVERRIDE;
+ fileapi::FileSystemContext* context) const OVERRIDE;
+ virtual fileapi::FileSystemQuotaUtil* GetQuotaUtil() OVERRIDE;
// Initialize the CopyOrMoveFileValidatorFactory. Invalid to call more than
// once.
void InitializeCopyOrMoveFileValidatorFactory(
- scoped_ptr<CopyOrMoveFileValidatorFactory> factory);
+ scoped_ptr<fileapi::CopyOrMoveFileValidatorFactory> factory);
- const UpdateObserverList* GetUpdateObservers(FileSystemType type) const;
- void AddFileChangeObserver(FileChangeObserver* observer);
+ const fileapi::UpdateObserverList*
+ GetUpdateObservers(fileapi::FileSystemType type) const;
+ void AddFileChangeObserver(fileapi::FileChangeObserver* observer);
// For CopyOrMoveFileValidatorFactory testing. Once it's set to true
// GetCopyOrMoveFileValidatorFactory will start returning security
@@ -78,16 +83,16 @@
base::FilePath base_path_;
scoped_refptr<base::SequencedTaskRunner> task_runner_;
- scoped_ptr<AsyncFileUtilAdapter> file_util_;
+ scoped_ptr<fileapi::AsyncFileUtilAdapter> file_util_;
scoped_ptr<QuotaUtil> quota_util_;
bool require_copy_or_move_validator_;
- scoped_ptr<CopyOrMoveFileValidatorFactory>
+ scoped_ptr<fileapi::CopyOrMoveFileValidatorFactory>
copy_or_move_file_validator_factory_;
DISALLOW_COPY_AND_ASSIGN(TestFileSystemBackend);
};
-} // namespace fileapi
+} // namespace content
#endif // CONTENT_PUBLIC_TEST_TEST_FILE_SYSTEM_BACKEND_H_
