Index: content/browser/fileapi/obfuscated_file_util_unittest.cc |
diff --git a/content/browser/fileapi/obfuscated_file_util_unittest.cc b/content/browser/fileapi/obfuscated_file_util_unittest.cc |
index 089cef8d73d78c28e0adc4cde2697aa6d8e4c1fe..8d560ac0cc5d1faa39c7405deb2c26feeccc9164 100644 |
--- a/content/browser/fileapi/obfuscated_file_util_unittest.cc |
+++ b/content/browser/fileapi/obfuscated_file_util_unittest.cc |
@@ -20,30 +20,30 @@ |
#include "content/public/test/test_file_system_context.h" |
#include "content/test/fileapi_test_file_set.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-#include "webkit/browser/fileapi/external_mount_points.h" |
-#include "webkit/browser/fileapi/file_system_backend.h" |
-#include "webkit/browser/fileapi/file_system_context.h" |
-#include "webkit/browser/fileapi/file_system_operation_context.h" |
-#include "webkit/browser/fileapi/file_system_usage_cache.h" |
-#include "webkit/browser/fileapi/obfuscated_file_util.h" |
-#include "webkit/browser/fileapi/sandbox_directory_database.h" |
-#include "webkit/browser/fileapi/sandbox_file_system_backend_delegate.h" |
-#include "webkit/browser/fileapi/sandbox_isolated_origin_database.h" |
-#include "webkit/browser/fileapi/sandbox_origin_database.h" |
-#include "webkit/browser/quota/quota_manager.h" |
-#include "webkit/common/database/database_identifier.h" |
-#include "webkit/common/quota/quota_types.h" |
+#include "storage/browser/fileapi/external_mount_points.h" |
+#include "storage/browser/fileapi/file_system_backend.h" |
+#include "storage/browser/fileapi/file_system_context.h" |
+#include "storage/browser/fileapi/file_system_operation_context.h" |
+#include "storage/browser/fileapi/file_system_usage_cache.h" |
+#include "storage/browser/fileapi/obfuscated_file_util.h" |
+#include "storage/browser/fileapi/sandbox_directory_database.h" |
+#include "storage/browser/fileapi/sandbox_file_system_backend_delegate.h" |
+#include "storage/browser/fileapi/sandbox_isolated_origin_database.h" |
+#include "storage/browser/fileapi/sandbox_origin_database.h" |
+#include "storage/browser/quota/quota_manager.h" |
+#include "storage/common/database/database_identifier.h" |
+#include "storage/common/quota/quota_types.h" |
using content::AsyncFileTestHelper; |
-using fileapi::FileSystemContext; |
-using fileapi::FileSystemOperation; |
-using fileapi::FileSystemOperationContext; |
-using fileapi::FileSystemURL; |
-using fileapi::ObfuscatedFileUtil; |
-using fileapi::SandboxDirectoryDatabase; |
-using fileapi::SandboxIsolatedOriginDatabase; |
-using fileapi::kFileSystemTypeTemporary; |
-using fileapi::kFileSystemTypePersistent; |
+using storage::FileSystemContext; |
+using storage::FileSystemOperation; |
+using storage::FileSystemOperationContext; |
+using storage::FileSystemURL; |
+using storage::ObfuscatedFileUtil; |
+using storage::SandboxDirectoryDatabase; |
+using storage::SandboxIsolatedOriginDatabase; |
+using storage::kFileSystemTypeTemporary; |
+using storage::kFileSystemTypePersistent; |
namespace content { |
@@ -121,16 +121,17 @@ FileSystemURL FileSystemURLAppendUTF8( |
FileSystemURL FileSystemURLDirName(const FileSystemURL& url) { |
return FileSystemURL::CreateForTest( |
- url.origin(), url.mount_type(), |
- fileapi::VirtualPath::DirName(url.virtual_path())); |
+ url.origin(), |
+ url.mount_type(), |
+ storage::VirtualPath::DirName(url.virtual_path())); |
} |
-std::string GetTypeString(fileapi::FileSystemType type) { |
- return fileapi::SandboxFileSystemBackendDelegate::GetTypeString(type); |
+std::string GetTypeString(storage::FileSystemType type) { |
+ return storage::SandboxFileSystemBackendDelegate::GetTypeString(type); |
} |
bool HasFileSystemType(ObfuscatedFileUtil::AbstractOriginEnumerator* enumerator, |
- fileapi::FileSystemType type) { |
+ storage::FileSystemType type) { |
return enumerator->HasTypeDirectory(GetTypeString(type)); |
} |
@@ -144,12 +145,11 @@ class ObfuscatedFileUtilTest : public testing::Test { |
public: |
ObfuscatedFileUtilTest() |
: origin_(GURL("http://www.example.com")), |
- type_(fileapi::kFileSystemTypeTemporary), |
+ type_(storage::kFileSystemTypeTemporary), |
weak_factory_(this), |
sandbox_file_system_(origin_, type_), |
quota_status_(quota::kQuotaStatusUnknown), |
- usage_(-1) { |
- } |
+ usage_(-1) {} |
virtual void SetUp() { |
ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); |
@@ -173,8 +173,8 @@ class ObfuscatedFileUtilTest : public testing::Test { |
sandbox_file_system_.SetUp(file_system_context_.get()); |
- change_observers_ = fileapi::MockFileChangeObserver::CreateList( |
- &change_observer_); |
+ change_observers_ = |
+ storage::MockFileChangeObserver::CreateList(&change_observer_); |
} |
virtual void TearDown() { |
@@ -208,11 +208,11 @@ class ObfuscatedFileUtilTest : public testing::Test { |
return context; |
} |
- const fileapi::ChangeObserverList& change_observers() const { |
+ const storage::ChangeObserverList& change_observers() const { |
return change_observers_; |
} |
- fileapi::MockFileChangeObserver* change_observer() { |
+ storage::MockFileChangeObserver* change_observer() { |
return &change_observer_; |
} |
@@ -220,8 +220,8 @@ class ObfuscatedFileUtilTest : public testing::Test { |
// and obfuscated_file_util_. |
// Use this for tests which need to run in multiple origins; we need a test |
// helper per origin. |
- SandboxFileSystemTestHelper* NewFileSystem( |
- const GURL& origin, fileapi::FileSystemType type) { |
+ SandboxFileSystemTestHelper* NewFileSystem(const GURL& origin, |
+ storage::FileSystemType type) { |
SandboxFileSystemTestHelper* file_system = |
new SandboxFileSystemTestHelper(origin, type); |
@@ -249,9 +249,7 @@ class ObfuscatedFileUtilTest : public testing::Test { |
return origin_; |
} |
- fileapi::FileSystemType type() const { |
- return type_; |
- } |
+ storage::FileSystemType type() const { return type_; } |
std::string type_string() const { |
return GetTypeString(type_); |
@@ -303,7 +301,7 @@ class ObfuscatedFileUtilTest : public testing::Test { |
} |
int64 usage() const { return usage_; } |
- fileapi::FileSystemUsageCache* usage_cache() { |
+ storage::FileSystemUsageCache* usage_cache() { |
return sandbox_file_system_.usage_cache(); |
} |
@@ -440,7 +438,7 @@ class ObfuscatedFileUtilTest : public testing::Test { |
std::set<base::FilePath::StringType>* files, |
std::set<base::FilePath::StringType>* directories) { |
scoped_ptr<FileSystemOperationContext> context; |
- std::vector<fileapi::DirectoryEntry> entries; |
+ std::vector<storage::DirectoryEntry> entries; |
EXPECT_EQ(base::File::FILE_OK, |
AsyncFileTestHelper::ReadDirectory(file_system_context(), |
root_url, &entries)); |
@@ -482,17 +480,17 @@ class ObfuscatedFileUtilTest : public testing::Test { |
FillTestDirectory(root_url, &files, &directories); |
scoped_ptr<FileSystemOperationContext> context; |
- std::vector<fileapi::DirectoryEntry> entries; |
+ std::vector<storage::DirectoryEntry> entries; |
context.reset(NewContext(NULL)); |
EXPECT_EQ(base::File::FILE_OK, |
AsyncFileTestHelper::ReadDirectory( |
file_system_context(), root_url, &entries)); |
- std::vector<fileapi::DirectoryEntry>::iterator entry_iter; |
+ std::vector<storage::DirectoryEntry>::iterator entry_iter; |
EXPECT_EQ(files.size() + directories.size(), entries.size()); |
EXPECT_TRUE(change_observer()->HasNoChange()); |
for (entry_iter = entries.begin(); entry_iter != entries.end(); |
++entry_iter) { |
- const fileapi::DirectoryEntry& entry = *entry_iter; |
+ const storage::DirectoryEntry& entry = *entry_iter; |
std::set<base::FilePath::StringType>::iterator iter = |
files.find(entry.name); |
if (iter != files.end()) { |
@@ -804,13 +802,13 @@ class ObfuscatedFileUtilTest : public testing::Test { |
scoped_refptr<quota::QuotaManager> quota_manager_; |
scoped_refptr<FileSystemContext> file_system_context_; |
GURL origin_; |
- fileapi::FileSystemType type_; |
+ storage::FileSystemType type_; |
base::WeakPtrFactory<ObfuscatedFileUtilTest> weak_factory_; |
SandboxFileSystemTestHelper sandbox_file_system_; |
quota::QuotaStatusCode quota_status_; |
int64 usage_; |
- fileapi::MockFileChangeObserver change_observer_; |
- fileapi::ChangeObserverList change_observers_; |
+ storage::MockFileChangeObserver change_observer_; |
+ storage::ChangeObserverList change_observers_; |
private: |
DISALLOW_COPY_AND_ASSIGN(ObfuscatedFileUtilTest); |
@@ -1217,7 +1215,7 @@ TEST_F(ObfuscatedFileUtilTest, TestReadDirectoryOnFile) { |
ofu()->EnsureFileExists(context.get(), url, &created)); |
ASSERT_TRUE(created); |
- std::vector<fileapi::DirectoryEntry> entries; |
+ std::vector<storage::DirectoryEntry> entries; |
EXPECT_EQ(base::File::FILE_ERROR_NOT_A_DIRECTORY, |
AsyncFileTestHelper::ReadDirectory(file_system_context(), url, |
&entries)); |
@@ -1795,7 +1793,7 @@ TEST_F(ObfuscatedFileUtilTest, TestIncompleteDirectoryReading) { |
EXPECT_TRUE(created); |
} |
- std::vector<fileapi::DirectoryEntry> entries; |
+ std::vector<storage::DirectoryEntry> entries; |
EXPECT_EQ(base::File::FILE_OK, |
AsyncFileTestHelper::ReadDirectory( |
file_system_context(), empty_path, &entries)); |
@@ -2040,7 +2038,7 @@ TEST_F(ObfuscatedFileUtilTest, TestFileEnumeratorTimestamp) { |
base::Time())); |
context.reset(NewContext(NULL)); |
- scoped_ptr<fileapi::FileSystemFileUtil::AbstractFileEnumerator> file_enum( |
+ scoped_ptr<storage::FileSystemFileUtil::AbstractFileEnumerator> file_enum( |
ofu()->CreateFileEnumerator(context.get(), dir, false)); |
int count = 0; |