Index: chrome/browser/net/crl_set_fetcher.cc |
diff --git a/chrome/browser/net/crl_set_fetcher.cc b/chrome/browser/net/crl_set_fetcher.cc |
index 09f9a9c15143aa9e941c1ff2891e130aad2b5d92..41189520b051e242493b6cd0ba4361a5d9d26030 100644 |
--- a/chrome/browser/net/crl_set_fetcher.cc |
+++ b/chrome/browser/net/crl_set_fetcher.cc |
@@ -36,7 +36,7 @@ base::FilePath CRLSetFetcher::GetCRLSetFilePath() const { |
void CRLSetFetcher::StartInitialLoad(ComponentUpdateService* cus, |
const base::FilePath& path) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
if (path.empty()) |
return; |
SetCRLSetFilePath(path); |
@@ -50,7 +50,7 @@ void CRLSetFetcher::StartInitialLoad(ComponentUpdateService* cus, |
} |
void CRLSetFetcher::DeleteFromDisk(const base::FilePath& path) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
if (path.empty()) |
return; |
@@ -63,7 +63,7 @@ void CRLSetFetcher::DeleteFromDisk(const base::FilePath& path) { |
} |
void CRLSetFetcher::DoInitialLoadFromDisk() { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE); |
LoadFromDisk(GetCRLSetFilePath(), &crl_set_); |
@@ -87,7 +87,7 @@ void CRLSetFetcher::LoadFromDisk(base::FilePath path, |
scoped_refptr<net::CRLSet>* out_crl_set) { |
TRACE_EVENT0("CRLSetFetcher", "LoadFromDisk"); |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE); |
std::string crl_set_bytes; |
{ |
@@ -113,7 +113,7 @@ void CRLSetFetcher::LoadFromDisk(base::FilePath path, |
void CRLSetFetcher::SetCRLSetIfNewer( |
scoped_refptr<net::CRLSet> crl_set) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::IO); |
scoped_refptr<net::CRLSet> old_crl_set(net::SSLConfigService::GetCRLSet()); |
if (old_crl_set.get() && old_crl_set->sequence() > crl_set->sequence()) { |
@@ -137,7 +137,7 @@ static const uint8 kPublicKeySHA256[32] = { |
}; |
void CRLSetFetcher::RegisterComponent(uint32 sequence_of_loaded_crl) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
update_client::CrxComponent component; |
component.pk_hash.assign(kPublicKeySHA256, |
@@ -158,7 +158,7 @@ void CRLSetFetcher::RegisterComponent(uint32 sequence_of_loaded_crl) { |
} |
void CRLSetFetcher::DoDeleteFromDisk() { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::FILE); |
DeleteFile(GetCRLSetFilePath(), false /* not recursive */); |
} |