Index: content/browser/fileapi/file_system_quota_client_unittest.cc |
diff --git a/content/browser/fileapi/file_system_quota_client_unittest.cc b/content/browser/fileapi/file_system_quota_client_unittest.cc |
index 65eaf57d16495198216523b45b43ff45bfba42af..9b5003f162e008672d45ba535c2ad1037fdd3ff9 100644 |
--- a/content/browser/fileapi/file_system_quota_client_unittest.cc |
+++ b/content/browser/fileapi/file_system_quota_client_unittest.cc |
@@ -12,17 +12,17 @@ |
#include "content/public/test/test_file_system_context.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "url/gurl.h" |
-#include "webkit/browser/fileapi/file_system_context.h" |
-#include "webkit/browser/fileapi/file_system_quota_client.h" |
-#include "webkit/browser/fileapi/file_system_usage_cache.h" |
-#include "webkit/browser/fileapi/obfuscated_file_util.h" |
-#include "webkit/common/fileapi/file_system_types.h" |
-#include "webkit/common/fileapi/file_system_util.h" |
-#include "webkit/common/quota/quota_types.h" |
+#include "storage/browser/fileapi/file_system_context.h" |
+#include "storage/browser/fileapi/file_system_quota_client.h" |
+#include "storage/browser/fileapi/file_system_usage_cache.h" |
+#include "storage/browser/fileapi/obfuscated_file_util.h" |
+#include "storage/common/fileapi/file_system_types.h" |
+#include "storage/common/fileapi/file_system_util.h" |
+#include "storage/common/quota/quota_types.h" |
using content::AsyncFileTestHelper; |
-using fileapi::FileSystemQuotaClient; |
-using fileapi::FileSystemURL; |
+using storage::FileSystemQuotaClient; |
+using storage::FileSystemURL; |
namespace content { |
namespace { |
@@ -119,8 +119,8 @@ class FileSystemQuotaClientTest : public testing::Test { |
bool CreateFileSystemDirectory(const base::FilePath& file_path, |
const std::string& origin_url, |
quota::StorageType storage_type) { |
- fileapi::FileSystemType type = |
- fileapi::QuotaStorageTypeToFileSystemType(storage_type); |
+ storage::FileSystemType type = |
+ storage::QuotaStorageTypeToFileSystemType(storage_type); |
FileSystemURL url = file_system_context_->CreateCrackedFileSystemURL( |
GURL(origin_url), type, file_path); |
@@ -136,8 +136,8 @@ class FileSystemQuotaClientTest : public testing::Test { |
if (file_path.empty()) |
return false; |
- fileapi::FileSystemType type = |
- fileapi::QuotaStorageTypeToFileSystemType(storage_type); |
+ storage::FileSystemType type = |
+ storage::QuotaStorageTypeToFileSystemType(storage_type); |
FileSystemURL url = file_system_context_->CreateCrackedFileSystemURL( |
GURL(origin_url), type, file_path); |
@@ -189,8 +189,8 @@ class FileSystemQuotaClientTest : public testing::Test { |
GURL(files[i].origin_url) == GURL(origin_url)) { |
base::FilePath path = base::FilePath().AppendASCII(files[i].name); |
if (!path.empty()) { |
- file_paths_cost += fileapi::ObfuscatedFileUtil::ComputeFilePathCost( |
- path); |
+ file_paths_cost += |
+ storage::ObfuscatedFileUtil::ComputeFilePathCost(path); |
} |
} |
} |
@@ -233,7 +233,7 @@ class FileSystemQuotaClientTest : public testing::Test { |
base::ScopedTempDir data_dir_; |
base::MessageLoop message_loop_; |
- scoped_refptr<fileapi::FileSystemContext> file_system_context_; |
+ scoped_refptr<storage::FileSystemContext> file_system_context_; |
base::WeakPtrFactory<FileSystemQuotaClientTest> weak_factory_; |
int64 usage_; |
int additional_callback_count_; |