summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/drive/sync_client.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/chromeos/drive/sync_client.cc')
-rw-r--r--chrome/browser/chromeos/drive/sync_client.cc36
1 files changed, 16 insertions, 20 deletions
diff --git a/chrome/browser/chromeos/drive/sync_client.cc b/chrome/browser/chromeos/drive/sync_client.cc
index 43e4b86..c920606 100644
--- a/chrome/browser/chromeos/drive/sync_client.cc
+++ b/chrome/browser/chromeos/drive/sync_client.cc
@@ -15,11 +15,8 @@
#include "chrome/browser/chromeos/drive/file_system_util.h"
#include "chrome/browser/chromeos/drive/job_scheduler.h"
#include "chrome/browser/chromeos/drive/sync/entry_update_performer.h"
-#include "content/public/browser/browser_thread.h"
#include "google_apis/drive/task_util.h"
-using content::BrowserThread;
-
namespace drive {
namespace internal {
@@ -165,15 +162,14 @@ SyncClient::SyncClient(base::SequencedTaskRunner* blocking_task_runner,
delay_(base::TimeDelta::FromSeconds(kDelaySeconds)),
long_delay_(base::TimeDelta::FromSeconds(kLongDelaySeconds)),
weak_ptr_factory_(this) {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
}
SyncClient::~SyncClient() {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ DCHECK(thread_checker_.CalledOnValidThread());
}
void SyncClient::StartProcessingBacklog() {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ DCHECK(thread_checker_.CalledOnValidThread());
std::vector<std::string>* to_fetch = new std::vector<std::string>;
std::vector<std::string>* to_update = new std::vector<std::string>;
@@ -187,7 +183,7 @@ void SyncClient::StartProcessingBacklog() {
}
void SyncClient::StartCheckingExistingPinnedFiles() {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ DCHECK(thread_checker_.CalledOnValidThread());
std::vector<std::string>* local_ids = new std::vector<std::string>;
blocking_task_runner_->PostTaskAndReply(
@@ -202,12 +198,12 @@ void SyncClient::StartCheckingExistingPinnedFiles() {
}
void SyncClient::AddFetchTask(const std::string& local_id) {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ DCHECK(thread_checker_.CalledOnValidThread());
AddFetchTaskInternal(local_id, delay_);
}
void SyncClient::RemoveFetchTask(const std::string& local_id) {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ DCHECK(thread_checker_.CalledOnValidThread());
SyncTasks::iterator it = tasks_.find(SyncTasks::key_type(FETCH, local_id));
if (it == tasks_.end())
@@ -228,14 +224,14 @@ void SyncClient::RemoveFetchTask(const std::string& local_id) {
void SyncClient::AddUpdateTask(const ClientContext& context,
const std::string& local_id) {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ DCHECK(thread_checker_.CalledOnValidThread());
AddUpdateTaskInternal(context, local_id, delay_);
}
bool SyncClient:: WaitForUpdateTaskToComplete(
const std::string& local_id,
const FileOperationCallback& callback) {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ DCHECK(thread_checker_.CalledOnValidThread());
SyncTasks::iterator it = tasks_.find(SyncTasks::key_type(UPDATE, local_id));
if (it == tasks_.end())
@@ -248,7 +244,7 @@ bool SyncClient:: WaitForUpdateTaskToComplete(
base::Closure SyncClient::PerformFetchTask(const std::string& local_id,
const ClientContext& context) {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ DCHECK(thread_checker_.CalledOnValidThread());
return download_operation_->EnsureFileDownloadedByLocalId(
local_id,
context,
@@ -261,7 +257,7 @@ base::Closure SyncClient::PerformFetchTask(const std::string& local_id,
void SyncClient::AddFetchTaskInternal(const std::string& local_id,
const base::TimeDelta& delay) {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ DCHECK(thread_checker_.CalledOnValidThread());
SyncTask task;
task.state = PENDING;
@@ -274,7 +270,7 @@ void SyncClient::AddFetchTaskInternal(const std::string& local_id,
base::Closure SyncClient::PerformUpdateTask(const std::string& local_id,
const ClientContext& context) {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ DCHECK(thread_checker_.CalledOnValidThread());
entry_update_performer_->UpdateEntry(
local_id,
context,
@@ -288,7 +284,7 @@ base::Closure SyncClient::PerformUpdateTask(const std::string& local_id,
void SyncClient::AddUpdateTaskInternal(const ClientContext& context,
const std::string& local_id,
const base::TimeDelta& delay) {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ DCHECK(thread_checker_.CalledOnValidThread());
SyncTask task;
task.state = PENDING;
@@ -302,7 +298,7 @@ void SyncClient::AddUpdateTaskInternal(const ClientContext& context,
void SyncClient::AddTask(const SyncTasks::key_type& key,
const SyncTask& task,
const base::TimeDelta& delay) {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ DCHECK(thread_checker_.CalledOnValidThread());
SyncTasks::iterator it = tasks_.find(key);
if (it != tasks_.end()) {
@@ -391,7 +387,7 @@ void SyncClient::StartTaskAfterGetParentResourceEntry(
void SyncClient::OnGetLocalIdsOfBacklog(
const std::vector<std::string>* to_fetch,
const std::vector<std::string>* to_update) {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ DCHECK(thread_checker_.CalledOnValidThread());
// Give priority to upload tasks over fetch tasks, so that dirty files are
// uploaded as soon as possible.
@@ -409,7 +405,7 @@ void SyncClient::OnGetLocalIdsOfBacklog(
}
void SyncClient::AddFetchTasks(const std::vector<std::string>* local_ids) {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ DCHECK(thread_checker_.CalledOnValidThread());
for (size_t i = 0; i < local_ids->size(); ++i)
AddFetchTask((*local_ids)[i]);
@@ -418,7 +414,7 @@ void SyncClient::AddFetchTasks(const std::vector<std::string>* local_ids) {
void SyncClient::OnTaskComplete(SyncType type,
const std::string& local_id,
FileError error) {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ DCHECK(thread_checker_.CalledOnValidThread());
const SyncTasks::key_type key(type, local_id);
SyncTasks::iterator it = tasks_.find(key);
@@ -478,7 +474,7 @@ void SyncClient::OnFetchFileComplete(const std::string& local_id,
FileError error,
const base::FilePath& local_path,
scoped_ptr<ResourceEntry> entry) {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ DCHECK(thread_checker_.CalledOnValidThread());
OnTaskComplete(FETCH, local_id, error);
if (error == FILE_ERROR_ABORT) {
// If user cancels download, unpin the file so that we do not sync the file
generated by cgit v1.1 at 2025-05-14 13:57:08 +0000