#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
#include "base/message_loop/message_loop.h"
#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
#include "content/public/browser/storage_partition.h"
#include "content/public/test/test_browser_thread.h"
#include "content/public/test/test_browser_thread_bundle.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/common/fileapi/file_system_types.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_url.h"
+#include "storage/common/fileapi/file_system_types.h"
using content::BrowserContext;
using content::BrowserThread;
namespace {
-// Shorter names for fileapi::* constants.
-const fileapi::FileSystemType kTemporary = fileapi::kFileSystemTypeTemporary;
-const fileapi::FileSystemType kPersistent = fileapi::kFileSystemTypePersistent;
+// Shorter names for storage::* constants.
+const storage::FileSystemType kTemporary = storage::kFileSystemTypeTemporary;
+const storage::FileSystemType kPersistent = storage::kFileSystemTypePersistent;
// We'll use these three distinct origins for testing, both as strings and as
// GURLs in appropriate contexts.
}
// Callback that should be executed in response to
- // fileapi::FileSystemContext::OpenFileSystem.
+ // storage::FileSystemContext::OpenFileSystem.
void OpenFileSystemCallback(const GURL& root,
const std::string& name,
base::File::Error error) {
}
bool OpenFileSystem(const GURL& origin,
- fileapi::FileSystemType type,
- fileapi::OpenFileSystemMode open_mode) {
+ storage::FileSystemType type,
+ storage::OpenFileSystemMode open_mode) {
BrowserContext::GetDefaultStoragePartition(profile_.get())->
GetFileSystemContext()->OpenFileSystem(
origin, type, open_mode,
return open_file_system_result_ == base::File::FILE_OK;
}
- // Calls fileapi::FileSystemContext::OpenFileSystem with
+ // Calls storage::FileSystemContext::OpenFileSystem with
// OPEN_FILE_SYSTEM_FAIL_IF_NONEXISTENT flag
// to verify the existence of a file system for a specified type and origin,
// blocks until a response is available, then returns the result
// synchronously to it's caller.
bool FileSystemContainsOriginAndType(const GURL& origin,
- fileapi::FileSystemType type) {
- return OpenFileSystem(origin, type,
- fileapi::OPEN_FILE_SYSTEM_FAIL_IF_NONEXISTENT);
+ storage::FileSystemType type) {
+ return OpenFileSystem(
+ origin, type, storage::OPEN_FILE_SYSTEM_FAIL_IF_NONEXISTENT);
}
// Callback that should be executed in response to StartFetching(), and stores
// Calls OpenFileSystem with OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT
// to create a filesystem of a given type for a specified origin.
void CreateDirectoryForOriginAndType(const GURL& origin,
- fileapi::FileSystemType type) {
- OpenFileSystem(origin, type,
- fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT);
+ storage::FileSystemType type) {
+ OpenFileSystem(
+ origin, type, storage::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT);
EXPECT_EQ(base::File::FILE_OK, open_file_system_result_);
}
EXPECT_FALSE(ContainsKey(info->usage_map, kPersistent));
EXPECT_TRUE(ContainsKey(info->usage_map, kTemporary));
EXPECT_EQ(kEmptyFileSystemSize,
- info->usage_map[fileapi::kFileSystemTypeTemporary]);
+ info->usage_map[storage::kFileSystemTypeTemporary]);
} else if (info->origin == kOrigin2) {
EXPECT_FALSE(test_hosts_found[1]);
test_hosts_found[1] = true;