Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7208)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/drive/job_scheduler.cc

Issue 1036723003: favor DCHECK_CURRENTLY_ON for better logs in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.cc ('k') | chrome/browser/chromeos/drive/resource_metadata.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/drive/job_scheduler.cc
diff --git a/chrome/browser/chromeos/drive/job_scheduler.cc b/chrome/browser/chromeos/drive/job_scheduler.cc
index 328f14f4bf517700f063ed35d0bd7b0f48b5a3e0..a74485e0c8319b5b1b9a572bc224227f57793dc2 100644
--- a/chrome/browser/chromeos/drive/job_scheduler.cc
+++ b/chrome/browser/chromeos/drive/job_scheduler.cc
@@ -171,11 +171,11 @@ JobScheduler::JobEntry::JobEntry(JobType type)
: job_info(type),
context(ClientContext(USER_INITIATED)),
retry_count(0) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
}
JobScheduler::JobEntry::~JobEntry() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
}
struct JobScheduler::ResumeUploadParams {
@@ -197,7 +197,7 @@ JobScheduler::JobScheduler(PrefService* pref_service,
uploader_(new DriveUploader(drive_service, blocking_task_runner)),
pref_service_(pref_service),
weak_ptr_factory_(this) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
for (int i = 0; i < NUM_QUEUES; ++i)
queue_[i].reset(new JobQueue(kMaxJobCount[i], NUM_CONTEXT_TYPES));
@@ -206,7 +206,7 @@ JobScheduler::JobScheduler(PrefService* pref_service,
}
JobScheduler::~JobScheduler() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
size_t num_queued_jobs = 0;
for (int i = 0; i < NUM_QUEUES; ++i)
@@ -224,17 +224,17 @@ std::vector<JobInfo> JobScheduler::GetJobInfoList() {
}
void JobScheduler::AddObserver(JobListObserver* observer) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
observer_list_.AddObserver(observer);
}
void JobScheduler::RemoveObserver(JobListObserver* observer) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
observer_list_.RemoveObserver(observer);
}
void JobScheduler::CancelJob(JobID job_id) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
JobEntry* job = job_map_.Lookup(job_id);
if (job) {
@@ -251,7 +251,7 @@ void JobScheduler::CancelJob(JobID job_id) {
}
void JobScheduler::CancelAllJobs() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
// CancelJob may remove the entry from |job_map_|. That's OK. IDMap supports
// removable during iteration.
@@ -261,7 +261,7 @@ void JobScheduler::CancelAllJobs() {
void JobScheduler::GetAboutResource(
const google_apis::AboutResourceCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
JobEntry* new_job = CreateNewJob(TYPE_GET_ABOUT_RESOURCE);
@@ -277,7 +277,7 @@ void JobScheduler::GetAboutResource(
}
void JobScheduler::GetAppList(const google_apis::AppListCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
JobEntry* new_job = CreateNewJob(TYPE_GET_APP_LIST);
@@ -294,7 +294,7 @@ void JobScheduler::GetAppList(const google_apis::AppListCallback& callback) {
void JobScheduler::GetAllFileList(
const google_apis::FileListCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
JobEntry* new_job = CreateNewJob(TYPE_GET_ALL_RESOURCE_LIST);
@@ -312,7 +312,7 @@ void JobScheduler::GetAllFileList(
void JobScheduler::GetFileListInDirectory(
const std::string& directory_resource_id,
const google_apis::FileListCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
JobEntry* new_job = CreateNewJob(
@@ -331,7 +331,7 @@ void JobScheduler::GetFileListInDirectory(
void JobScheduler::Search(const std::string& search_query,
const google_apis::FileListCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
JobEntry* new_job = CreateNewJob(TYPE_SEARCH);
@@ -350,7 +350,7 @@ void JobScheduler::Search(const std::string& search_query,
void JobScheduler::GetChangeList(
int64 start_changestamp,
const google_apis::ChangeListCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
JobEntry* new_job = CreateNewJob(TYPE_GET_CHANGE_LIST);
@@ -369,7 +369,7 @@ void JobScheduler::GetChangeList(
void JobScheduler::GetRemainingChangeList(
const GURL& next_link,
const google_apis::ChangeListCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
JobEntry* new_job = CreateNewJob(TYPE_GET_REMAINING_CHANGE_LIST);
@@ -388,7 +388,7 @@ void JobScheduler::GetRemainingChangeList(
void JobScheduler::GetRemainingFileList(
const GURL& next_link,
const google_apis::FileListCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
JobEntry* new_job = CreateNewJob(TYPE_GET_REMAINING_FILE_LIST);
@@ -408,7 +408,7 @@ void JobScheduler::GetFileResource(
const std::string& resource_id,
const ClientContext& context,
const google_apis::FileResourceCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
JobEntry* new_job = CreateNewJob(TYPE_GET_RESOURCE_ENTRY);
@@ -430,7 +430,7 @@ void JobScheduler::GetShareUrl(
const GURL& embed_origin,
const ClientContext& context,
const google_apis::GetShareUrlCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
JobEntry* new_job = CreateNewJob(TYPE_GET_SHARE_URL);
@@ -452,7 +452,7 @@ void JobScheduler::TrashResource(
const std::string& resource_id,
const ClientContext& context,
const google_apis::EntryActionCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
JobEntry* new_job = CreateNewJob(TYPE_TRASH_RESOURCE);
@@ -475,7 +475,7 @@ void JobScheduler::CopyResource(
const std::string& new_title,
const base::Time& last_modified,
const google_apis::FileResourceCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
JobEntry* new_job = CreateNewJob(TYPE_COPY_RESOURCE);
@@ -503,7 +503,7 @@ void JobScheduler::UpdateResource(
const google_apis::drive::Properties& properties,
const ClientContext& context,
const google_apis::FileResourceCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
JobEntry* new_job = CreateNewJob(TYPE_UPDATE_RESOURCE);
@@ -523,7 +523,7 @@ void JobScheduler::AddResourceToDirectory(
const std::string& parent_resource_id,
const std::string& resource_id,
const google_apis::EntryActionCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
JobEntry* new_job = CreateNewJob(TYPE_ADD_RESOURCE_TO_DIRECTORY);
@@ -545,7 +545,7 @@ void JobScheduler::RemoveResourceFromDirectory(
const std::string& resource_id,
const ClientContext& context,
const google_apis::EntryActionCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
JobEntry* new_job = CreateNewJob(TYPE_REMOVE_RESOURCE_FROM_DIRECTORY);
new_job->context = context;
@@ -568,7 +568,7 @@ void JobScheduler::AddNewDirectory(
const DriveServiceInterface::AddNewDirectoryOptions& options,
const ClientContext& context,
const google_apis::FileResourceCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
JobEntry* new_job = CreateNewJob(TYPE_ADD_NEW_DIRECTORY);
new_job->context = context;
@@ -594,7 +594,7 @@ JobID JobScheduler::DownloadFile(
const ClientContext& context,
const google_apis::DownloadActionCallback& download_action_callback,
const google_apis::GetContentCallback& get_content_callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
// Temporary histogram for crbug.com/229650.
CollectCopyHistogramSample("Drive.DownloadFromDriveFileSize",
@@ -631,7 +631,7 @@ void JobScheduler::UploadNewFile(
const DriveUploader::UploadNewFileOptions& options,
const ClientContext& context,
const google_apis::FileResourceCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
JobEntry* new_job = CreateNewJob(TYPE_UPLOAD_NEW_FILE);
new_job->job_info.file_path = drive_file_path;
@@ -675,7 +675,7 @@ void JobScheduler::UploadExistingFile(
const DriveUploader::UploadExistingFileOptions& options,
const ClientContext& context,
const google_apis::FileResourceCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
JobEntry* new_job = CreateNewJob(TYPE_UPLOAD_EXISTING_FILE);
new_job->job_info.file_path = drive_file_path;
@@ -715,7 +715,7 @@ void JobScheduler::AddPermission(
const std::string& email,
google_apis::drive::PermissionRole role,
const google_apis::EntryActionCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
JobEntry* new_job = CreateNewJob(TYPE_ADD_PERMISSION);
@@ -747,7 +747,7 @@ void JobScheduler::StartJob(JobEntry* job) {
}
void JobScheduler::QueueJob(JobID job_id) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
JobEntry* job_entry = job_map_.Lookup(job_id);
DCHECK(job_entry);
@@ -780,7 +780,7 @@ void JobScheduler::QueueJob(JobID job_id) {
}
void JobScheduler::DoJobLoop(QueueType queue_type) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
const int accepted_priority = GetCurrentAcceptedPriority(queue_type);
@@ -831,7 +831,7 @@ void JobScheduler::DoJobLoop(QueueType queue_type) {
}
int JobScheduler::GetCurrentAcceptedPriority(QueueType queue_type) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
const int kNoJobShouldRun = -1;
@@ -856,7 +856,7 @@ int JobScheduler::GetCurrentAcceptedPriority(QueueType queue_type) {
}
void JobScheduler::UpdateWait() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
if (disable_throttling_ || throttle_count_ == 0)
return;
@@ -872,7 +872,7 @@ void JobScheduler::UpdateWait() {
bool JobScheduler::OnJobDone(JobID job_id,
google_apis::DriveApiErrorCode error) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
JobEntry* job_entry = job_map_.Lookup(job_id);
DCHECK(job_entry);
@@ -933,7 +933,7 @@ void JobScheduler::OnGetFileListJobDone(
const google_apis::FileListCallback& callback,
google_apis::DriveApiErrorCode error,
scoped_ptr<google_apis::FileList> file_list) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
if (OnJobDone(job_id, error))
@@ -945,7 +945,7 @@ void JobScheduler::OnGetChangeListJobDone(
const google_apis::ChangeListCallback& callback,
google_apis::DriveApiErrorCode error,
scoped_ptr<google_apis::ChangeList> change_list) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
if (OnJobDone(job_id, error))
@@ -957,7 +957,7 @@ void JobScheduler::OnGetFileResourceJobDone(
const google_apis::FileResourceCallback& callback,
google_apis::DriveApiErrorCode error,
scoped_ptr<google_apis::FileResource> entry) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
if (OnJobDone(job_id, error))
@@ -969,7 +969,7 @@ void JobScheduler::OnGetAboutResourceJobDone(
const google_apis::AboutResourceCallback& callback,
google_apis::DriveApiErrorCode error,
scoped_ptr<google_apis::AboutResource> about_resource) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
if (OnJobDone(job_id, error))
@@ -981,7 +981,7 @@ void JobScheduler::OnGetShareUrlJobDone(
const google_apis::GetShareUrlCallback& callback,
google_apis::DriveApiErrorCode error,
const GURL& share_url) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
if (OnJobDone(job_id, error))
@@ -993,7 +993,7 @@ void JobScheduler::OnGetAppListJobDone(
const google_apis::AppListCallback& callback,
google_apis::DriveApiErrorCode error,
scoped_ptr<google_apis::AppList> app_list) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
if (OnJobDone(job_id, error))
@@ -1004,7 +1004,7 @@ void JobScheduler::OnEntryActionJobDone(
JobID job_id,
const google_apis::EntryActionCallback& callback,
google_apis::DriveApiErrorCode error) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
if (OnJobDone(job_id, error))
@@ -1016,7 +1016,7 @@ void JobScheduler::OnDownloadActionJobDone(
const google_apis::DownloadActionCallback& callback,
google_apis::DriveApiErrorCode error,
const base::FilePath& temp_file) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
if (OnJobDone(job_id, error))
@@ -1030,7 +1030,7 @@ void JobScheduler::OnUploadCompletionJobDone(
google_apis::DriveApiErrorCode error,
const GURL& upload_location,
scoped_ptr<google_apis::FileResource> entry) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!callback.is_null());
if (!upload_location.is_empty()) {
@@ -1067,7 +1067,7 @@ void JobScheduler::OnResumeUploadFileDone(
google_apis::DriveApiErrorCode error,
const GURL& upload_location,
scoped_ptr<google_apis::FileResource> entry) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!original_task.is_null());
DCHECK(!callback.is_null());
@@ -1095,7 +1095,7 @@ void JobScheduler::UpdateProgress(JobID job_id, int64 progress, int64 total) {
void JobScheduler::OnConnectionTypeChanged(
net::NetworkChangeNotifier::ConnectionType type) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
// Resume the job loop.
// Note that we don't need to check the network connection status as it will
@@ -1107,7 +1107,7 @@ void JobScheduler::OnConnectionTypeChanged(
void JobScheduler::OnGotFileSizeForJob(JobID job_id,
const std::string& histogram_name,
int64* size) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
if (*size == -1)
return;
@@ -1154,7 +1154,7 @@ JobScheduler::QueueType JobScheduler::GetJobQueueType(JobType type) {
void JobScheduler::AbortNotRunningJob(JobEntry* job,
google_apis::DriveApiErrorCode error) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
const base::TimeDelta elapsed = base::Time::Now() - job->job_info.start_time;
const QueueType queue_type = GetJobQueueType(job->job_info.job_type);
@@ -1175,19 +1175,19 @@ void JobScheduler::AbortNotRunningJob(JobEntry* job,
}
void JobScheduler::NotifyJobAdded(const JobInfo& job_info) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
FOR_EACH_OBSERVER(JobListObserver, observer_list_, OnJobAdded(job_info));
}
void JobScheduler::NotifyJobDone(const JobInfo& job_info,
google_apis::DriveApiErrorCode error) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
FOR_EACH_OBSERVER(JobListObserver, observer_list_,
OnJobDone(job_info, GDataToFileError(error)));
}
void JobScheduler::NotifyJobUpdated(const JobInfo& job_info) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
FOR_EACH_OBSERVER(JobListObserver, observer_list_, OnJobUpdated(job_info));
}
« no previous file with comments | « chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.cc ('k') | chrome/browser/chromeos/drive/resource_metadata.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698