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

Unified Diff: chrome/browser/extensions/blacklist_state_fetcher.cc

Issue 216513002: Replace DCHECK(BrowserThread::CurrentlyOn) with DCHECK_CURRENTLY_ON in extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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/extensions/blacklist.cc ('k') | chrome/browser/extensions/blob_reader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/blacklist_state_fetcher.cc
diff --git a/chrome/browser/extensions/blacklist_state_fetcher.cc b/chrome/browser/extensions/blacklist_state_fetcher.cc
index 82bea2ec5236f0ebf60ad8cb0d32ee0282be4109..c28afa0457cf08da80a0381d8f165cb9850877e8 100644
--- a/chrome/browser/extensions/blacklist_state_fetcher.cc
+++ b/chrome/browser/extensions/blacklist_state_fetcher.cc
@@ -27,7 +27,7 @@ class BlacklistRequestContextGetter : public net::URLRequestContextGetter {
net::URLRequestContextGetter* parent_context_getter) :
network_task_runner_(
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
url_request_context_.reset(new net::URLRequestContext());
url_request_context_->CopyFrom(
parent_context_getter->GetURLRequestContext());
@@ -37,7 +37,7 @@ class BlacklistRequestContextGetter : public net::URLRequestContextGetter {
scoped_refptr<net::URLRequestContextGetter> parent_context_getter,
base::Callback<void(scoped_refptr<net::URLRequestContextGetter>)>
callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
scoped_refptr<net::URLRequestContextGetter> context_getter =
new BlacklistRequestContextGetter(parent_context_getter);
@@ -47,7 +47,7 @@ class BlacklistRequestContextGetter : public net::URLRequestContextGetter {
}
virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
return url_request_context_.get();
}
@@ -75,14 +75,14 @@ BlacklistStateFetcher::BlacklistStateFetcher()
weak_ptr_factory_(this) {}
BlacklistStateFetcher::~BlacklistStateFetcher() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
STLDeleteContainerPairFirstPointers(requests_.begin(), requests_.end());
requests_.clear();
}
void BlacklistStateFetcher::Request(const std::string& id,
const RequestCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
if (!safe_browsing_config_) {
if (g_browser_process && g_browser_process->safe_browsing_service()) {
SetSafeBrowsingConfig(
@@ -124,14 +124,14 @@ void BlacklistStateFetcher::Request(const std::string& id,
void BlacklistStateFetcher::SaveRequestContext(
const std::string& id,
scoped_refptr<net::URLRequestContextGetter> request_context_getter) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
if (!url_request_context_getter_)
url_request_context_getter_ = request_context_getter;
SendRequest(id);
}
void BlacklistStateFetcher::SendRequest(const std::string& id) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
ClientCRXListInfoRequest request;
request.set_id(id);
@@ -176,7 +176,7 @@ GURL BlacklistStateFetcher::RequestUrl() const {
}
void BlacklistStateFetcher::OnURLFetchComplete(const net::URLFetcher* source) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
std::map<const net::URLFetcher*, std::string>::iterator it =
requests_.find(source);
« no previous file with comments | « chrome/browser/extensions/blacklist.cc ('k') | chrome/browser/extensions/blob_reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698