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

Unified Diff: content/browser/devtools/protocol/service_worker_handler.cc

Issue 1008613002: favor DCHECK_CURRENTLY_ON for better logs in content/browser/[a-d]* (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/devtools/protocol/service_worker_handler.cc
diff --git a/content/browser/devtools/protocol/service_worker_handler.cc b/content/browser/devtools/protocol/service_worker_handler.cc
index 68f05c08f01e0b08e914169631b867db7c22cdd6..3ad6887b82b6f5b504feea5bc4ed325c8831627d 100644
--- a/content/browser/devtools/protocol/service_worker_handler.cc
+++ b/content/browser/devtools/protocol/service_worker_handler.cc
@@ -142,11 +142,11 @@ ServiceWorkerHandler::ContextObserver::ContextObserver(
scoped_refptr<ServiceWorkerContextWrapper> context,
base::WeakPtr<ServiceWorkerHandler> handler)
: context_(context), handler_(handler) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
}
void ServiceWorkerHandler::ContextObserver::Start() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
base::Bind(&ServiceWorkerHandler::ContextObserver::
GetStoredRegistrationsOnIOThread,
@@ -154,14 +154,14 @@ void ServiceWorkerHandler::ContextObserver::Start() {
}
void ServiceWorkerHandler::ContextObserver::Stop() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
base::Bind(&ServiceWorkerHandler::ContextObserver::StopOnIOThread, this));
}
void ServiceWorkerHandler::ContextObserver::GetStoredRegistrationsOnIOThread() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
context_->context()->storage()->GetAllRegistrations(base::Bind(
&ServiceWorkerHandler::ContextObserver::OnStoredRegistrationsOnIOThread,
this));
@@ -169,7 +169,7 @@ void ServiceWorkerHandler::ContextObserver::GetStoredRegistrationsOnIOThread() {
void ServiceWorkerHandler::ContextObserver::OnStoredRegistrationsOnIOThread(
const std::vector<ServiceWorkerRegistrationInfo>& registrations) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
context_->AddObserver(this);
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
@@ -186,7 +186,7 @@ void ServiceWorkerHandler::ContextObserver::OnStoredRegistrationsOnIOThread(
}
void ServiceWorkerHandler::ContextObserver::StopOnIOThread() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
context_->RemoveObserver(this);
}
@@ -194,7 +194,7 @@ ServiceWorkerHandler::ContextObserver::~ContextObserver() {
}
void ServiceWorkerHandler::ContextObserver::OnVersionUpdated(int64 version_id) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
content::ServiceWorkerVersion* version =
context_->context()->GetLiveVersion(version_id);
if (!version)
@@ -235,7 +235,7 @@ void ServiceWorkerHandler::ContextObserver::OnVersionStateChanged(
void ServiceWorkerHandler::ContextObserver::OnRegistrationStored(
int64 registration_id,
const GURL& pattern) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
content::ServiceWorkerRegistration* registration =
context_->context()->GetLiveRegistration(registration_id);
DCHECK(registration);
@@ -250,7 +250,7 @@ void ServiceWorkerHandler::ContextObserver::OnRegistrationStored(
void ServiceWorkerHandler::ContextObserver::OnRegistrationDeleted(
int64 registration_id,
const GURL& pattern) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(&ServiceWorkerHandler::OnWorkerRegistrationDeleted, handler_,
« no previous file with comments | « content/browser/devtools/devtools_netlog_observer.cc ('k') | content/browser/devtools/service_worker_devtools_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698