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

Unified Diff: content/browser/shared_worker/shared_worker_service_impl.cc

Issue 1005683003: favor DCHECK_CURRENTLY_ON for better logs in content/browser/[q-z]* (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
Index: content/browser/shared_worker/shared_worker_service_impl.cc
diff --git a/content/browser/shared_worker/shared_worker_service_impl.cc b/content/browser/shared_worker/shared_worker_service_impl.cc
index fa19ebeae9db15fe99004300ec92f18b7d8c9e7c..0f6958b81762bbf20bcce9b9e8a0b4ba03d5e29c 100644
--- a/content/browser/shared_worker/shared_worker_service_impl.cc
+++ b/content/browser/shared_worker/shared_worker_service_impl.cc
@@ -190,7 +190,7 @@ class SharedWorkerServiceImpl::SharedWorkerReserver
void TryReserve(const base::Callback<void(bool)>& success_cb,
const base::Closure& failure_cb,
bool (*try_increment_worker_ref_count)(int)) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
if (!try_increment_worker_ref_count(worker_process_id_)) {
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, failure_cb);
return;
@@ -220,7 +220,7 @@ bool (*SharedWorkerServiceImpl::s_try_increment_worker_ref_count_)(int) =
TryIncrementWorkerRefCount;
SharedWorkerServiceImpl* SharedWorkerServiceImpl::GetInstance() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
return Singleton<SharedWorkerServiceImpl>::get();
}
@@ -269,12 +269,12 @@ std::vector<WorkerService::WorkerInfo> SharedWorkerServiceImpl::GetWorkers() {
}
void SharedWorkerServiceImpl::AddObserver(WorkerServiceObserver* observer) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
observers_.AddObserver(observer);
}
void SharedWorkerServiceImpl::RemoveObserver(WorkerServiceObserver* observer) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
observers_.RemoveObserver(observer);
}
@@ -285,7 +285,7 @@ void SharedWorkerServiceImpl::CreateWorker(
ResourceContext* resource_context,
const WorkerStoragePartitionId& partition_id,
bool* url_mismatch) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
*url_mismatch = false;
scoped_ptr<SharedWorkerInstance> instance(
new SharedWorkerInstance(params.url,
@@ -468,7 +468,7 @@ void SharedWorkerServiceImpl::NotifyWorkerDestroyed(int worker_process_id,
void SharedWorkerServiceImpl::ReserveRenderProcessToCreateWorker(
scoped_ptr<SharedWorkerPendingInstance> pending_instance,
bool* url_mismatch) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
DCHECK(!FindPendingInstance(*pending_instance->instance()));
if (url_mismatch)
*url_mismatch = false;
@@ -529,7 +529,7 @@ void SharedWorkerServiceImpl::RenderProcessReservedCallback(
int worker_route_id,
bool is_new_worker,
bool pause_on_start) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
// To offset the TryIncrementWorkerRefCount called for the reservation,
// calls DecrementWorkerRefCount after CheckWorkerDependency in
// ScopeWorkerDependencyChecker's destructor.

Powered by Google App Engine
This is Rietveld 408576698