#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/location.h"
-#include "base/message_loop/message_loop_proxy.h"
+#include "base/single_thread_task_runner.h"
+#include "base/thread_task_runner_handle.h"
#include "chrome/browser/sync_file_system/file_change.h"
#include "chrome/browser/sync_file_system/sync_file_metadata.h"
#include "chrome/browser/sync_file_system/syncable_file_system_util.h"
+#include "storage/browser/fileapi/file_system_url.h"
+#include "storage/common/fileapi/file_system_util.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/common/fileapi/file_system_util.h"
namespace sync_file_system {
}
void FakeRemoteChangeProcessor::PrepareForProcessRemoteChange(
- const fileapi::FileSystemURL& url,
+ const storage::FileSystemURL& url,
const PrepareChangeCallback& callback) {
SyncFileMetadata local_metadata;
- if (fileapi::VirtualPath::IsRootPath(url.path())) {
+ if (storage::VirtualPath::IsRootPath(url.path())) {
// Origin root directory case.
local_metadata = SyncFileMetadata(
SYNC_FILE_TYPE_DIRECTORY, 0, base::Time::Now());
if (found_list != local_changes_.end())
change_list = found_list->second;
- base::MessageLoopProxy::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(callback, SYNC_STATUS_OK,
local_metadata, change_list));
void FakeRemoteChangeProcessor::ApplyRemoteChange(
const FileChange& change,
const base::FilePath& local_path,
- const fileapi::FileSystemURL& url,
+ const storage::FileSystemURL& url,
const SyncStatusCallback& callback) {
SyncStatusCode status = SYNC_STATUS_UNKNOWN;
- base::FilePath ancestor = fileapi::VirtualPath::DirName(url.path());
+ base::FilePath ancestor = storage::VirtualPath::DirName(url.path());
while (true) {
- fileapi::FileSystemURL ancestor_url =
+ storage::FileSystemURL ancestor_url =
CreateSyncableFileSystemURL(url.origin(), ancestor);
if (!ancestor_url.is_valid())
break;
}
}
- base::FilePath ancestor_parent = fileapi::VirtualPath::DirName(ancestor);
+ base::FilePath ancestor_parent = storage::VirtualPath::DirName(ancestor);
if (ancestor == ancestor_parent)
break;
ancestor = ancestor_parent;
applied_changes_[url].push_back(change);
status = SYNC_STATUS_OK;
}
- base::MessageLoopProxy::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, status));
}
void FakeRemoteChangeProcessor::FinalizeRemoteSync(
- const fileapi::FileSystemURL& url,
+ const storage::FileSystemURL& url,
bool clear_local_changes,
const base::Closure& completion_callback) {
- base::MessageLoopProxy::current()->PostTask(FROM_HERE, completion_callback);
+ base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, completion_callback);
}
void FakeRemoteChangeProcessor::RecordFakeLocalChange(
- const fileapi::FileSystemURL& url,
+ const storage::FileSystemURL& url,
const FileChange& change,
const SyncStatusCallback& callback) {
local_changes_[url].Update(change);
- base::MessageLoopProxy::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, SYNC_STATUS_OK));
}
void FakeRemoteChangeProcessor::UpdateLocalFileMetadata(
- const fileapi::FileSystemURL& url,
+ const storage::FileSystemURL& url,
const FileChange& change) {
if (change.IsAddOrUpdate()) {
local_file_metadata_[url] = SyncFileMetadata(
}
void FakeRemoteChangeProcessor::ClearLocalChanges(
- const fileapi::FileSystemURL& url) {
+ const storage::FileSystemURL& url) {
local_changes_.erase(url);
}
EXPECT_EQ(expected_changes.size(), applied_changes_.size());
for (URLToFileChangesMap::const_iterator itr = applied_changes_.begin();
itr != applied_changes_.end(); ++itr) {
- const fileapi::FileSystemURL& url = itr->first;
+ const storage::FileSystemURL& url = itr->first;
URLToFileChangesMap::const_iterator found = expected_changes.find(url);
if (found == expected_changes.end()) {
EXPECT_TRUE(found != expected_changes.end())