Index: content/browser/fileapi/blob_url_request_job_unittest.cc |
diff --git a/content/browser/fileapi/blob_url_request_job_unittest.cc b/content/browser/fileapi/blob_url_request_job_unittest.cc |
index 4a30e11aef40eb1afefc5765aeb883a4f4d43019..e5d3fa66a9789545097acab544a27579f563d0a3 100644 |
--- a/content/browser/fileapi/blob_url_request_job_unittest.cc |
+++ b/content/browser/fileapi/blob_url_request_job_unittest.cc |
@@ -23,14 +23,14 @@ |
#include "net/url_request/url_request_context.h" |
#include "net/url_request/url_request_job_factory_impl.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-#include "webkit/browser/blob/blob_url_request_job.h" |
-#include "webkit/browser/fileapi/file_system_context.h" |
-#include "webkit/browser/fileapi/file_system_operation_context.h" |
-#include "webkit/browser/fileapi/file_system_url.h" |
-#include "webkit/common/blob/blob_data.h" |
+#include "storage/browser/blob/blob_url_request_job.h" |
+#include "storage/browser/fileapi/file_system_context.h" |
+#include "storage/browser/fileapi/file_system_operation_context.h" |
+#include "storage/browser/fileapi/file_system_url.h" |
+#include "storage/common/blob/blob_data.h" |
-using webkit_blob::BlobData; |
-using webkit_blob::BlobURLRequestJob; |
+using storage::BlobData; |
+using storage::BlobURLRequestJob; |
namespace content { |
@@ -47,8 +47,8 @@ const char kTestContentType[] = "foo/bar"; |
const char kTestContentDisposition[] = "attachment; filename=foo.txt"; |
const char kFileSystemURLOrigin[] = "http://remote"; |
-const fileapi::FileSystemType kFileSystemType = |
- fileapi::kFileSystemTypeTemporary; |
+const storage::FileSystemType kFileSystemType = |
+ storage::kFileSystemTypeTemporary; |
} // namespace |
@@ -114,7 +114,7 @@ class BlobURLRequestJobTest : public testing::Test { |
file_system_context_->OpenFileSystem( |
GURL(kFileSystemURLOrigin), |
kFileSystemType, |
- fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, |
+ storage::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, |
base::Bind(&BlobURLRequestJobTest::OnValidateFileSystem, |
base::Unretained(this))); |
base::RunLoop().RunUntilIdle(); |
@@ -140,7 +140,7 @@ class BlobURLRequestJobTest : public testing::Test { |
void WriteFileSystemFile(const std::string& filename, |
const char* buf, int buf_size, |
base::Time* modification_time) { |
- fileapi::FileSystemURL url = |
+ storage::FileSystemURL url = |
file_system_context_->CreateCrackedFileSystemURL( |
GURL(kFileSystemURLOrigin), |
kFileSystemType, |
@@ -243,7 +243,7 @@ class BlobURLRequestJobTest : public testing::Test { |
base::Time temp_file_system_file_modification_time2_; |
base::MessageLoopForIO message_loop_; |
- scoped_refptr<fileapi::FileSystemContext> file_system_context_; |
+ scoped_refptr<storage::FileSystemContext> file_system_context_; |
scoped_refptr<BlobData> blob_data_; |
net::URLRequestJobFactoryImpl url_request_job_factory_; |
net::URLRequestContext url_request_context_; |