| Index: content/browser/fileapi/file_system_url_request_job_unittest.cc
|
| diff --git a/content/browser/fileapi/file_system_url_request_job_unittest.cc b/content/browser/fileapi/file_system_url_request_job_unittest.cc
|
| index 7edd26aa6562076b6e61d4b45b76a1bed3f2d17c..e4fbc15e6bfb543cebc3448d8910c7b009bf6e6f 100644
|
| --- a/content/browser/fileapi/file_system_url_request_job_unittest.cc
|
| +++ b/content/browser/fileapi/file_system_url_request_job_unittest.cc
|
| @@ -37,7 +37,12 @@
|
| #include "webkit/browser/fileapi/file_system_context.h"
|
| #include "webkit/browser/fileapi/file_system_file_util.h"
|
|
|
| -namespace fileapi {
|
| +using fileapi::AsyncFileTestHelper;
|
| +using fileapi::FileSystemContext;
|
| +using fileapi::FileSystemURL;
|
| +using fileapi::FileSystemURLRequestJob;
|
| +
|
| +namespace content {
|
| namespace {
|
|
|
| // We always use the TEMPORARY FileSystem in this test.
|
| @@ -64,8 +69,8 @@ class FileSystemURLRequestJobTest : public testing::Test {
|
| CreateFileSystemContextForTesting(NULL, temp_dir_.path());
|
|
|
| file_system_context_->OpenFileSystem(
|
| - GURL("http://remote/"), kFileSystemTypeTemporary,
|
| - OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
|
| + GURL("http://remote/"), fileapi::kFileSystemTypeTemporary,
|
| + fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
|
| base::Bind(&FileSystemURLRequestJobTest::OnOpenFileSystem,
|
| weak_factory_.GetWeakPtr()));
|
| base::RunLoop().RunUntilIdle();
|
| @@ -135,7 +140,7 @@ class FileSystemURLRequestJobTest : public testing::Test {
|
| void CreateDirectory(const base::StringPiece& dir_name) {
|
| FileSystemURL url = file_system_context_->CreateCrackedFileSystemURL(
|
| GURL("http://remote"),
|
| - kFileSystemTypeTemporary,
|
| + fileapi::kFileSystemTypeTemporary,
|
| base::FilePath().AppendASCII(dir_name));
|
| ASSERT_EQ(base::PLATFORM_FILE_OK, AsyncFileTestHelper::CreateDirectory(
|
| file_system_context_, url));
|
| @@ -145,7 +150,7 @@ class FileSystemURLRequestJobTest : public testing::Test {
|
| const char* buf, int buf_size) {
|
| FileSystemURL url = file_system_context_->CreateCrackedFileSystemURL(
|
| GURL("http://remote"),
|
| - kFileSystemTypeTemporary,
|
| + fileapi::kFileSystemTypeTemporary,
|
| base::FilePath().AppendASCII(file_name));
|
| ASSERT_EQ(base::PLATFORM_FILE_OK,
|
| AsyncFileTestHelper::CreateFileWithData(
|
| @@ -177,7 +182,7 @@ class FileSystemURLRequestJobTest : public testing::Test {
|
| base::MessageLoopForIO message_loop_;
|
|
|
| base::ScopedTempDir temp_dir_;
|
| - scoped_refptr<FileSystemContext> file_system_context_;
|
| + scoped_refptr<fileapi::FileSystemContext> file_system_context_;
|
| base::WeakPtrFactory<FileSystemURLRequestJobTest> weak_factory_;
|
|
|
| net::URLRequestContext empty_context_;
|
| @@ -365,4 +370,4 @@ TEST_F(FileSystemURLRequestJobTest, Incognito) {
|
| }
|
|
|
| } // namespace
|
| -} // namespace fileapi
|
| +} // namespace content
|
|
|