Index: chrome/browser/extensions/updater/safe_manifest_parser.cc |
diff --git a/chrome/browser/extensions/updater/safe_manifest_parser.cc b/chrome/browser/extensions/updater/safe_manifest_parser.cc |
index 2eaa5a77189ca504292581288d7e3fc4cb0f566e..fa5a61c506f37092f55c410236e375bd2fd8d7bb 100644 |
--- a/chrome/browser/extensions/updater/safe_manifest_parser.cc |
+++ b/chrome/browser/extensions/updater/safe_manifest_parser.cc |
@@ -24,11 +24,11 @@ SafeManifestParser::SafeManifestParser(const std::string& xml, |
: xml_(xml), |
fetch_data_(fetch_data), |
update_callback_(update_callback) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
} |
void SafeManifestParser::Start() { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
if (!BrowserThread::PostTask( |
BrowserThread::IO, FROM_HERE, |
base::Bind(&SafeManifestParser::ParseInSandbox, this))) { |
@@ -42,7 +42,7 @@ SafeManifestParser::~SafeManifestParser() { |
} |
void SafeManifestParser::ParseInSandbox() { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::IO); |
content::UtilityProcessHost* host = content::UtilityProcessHost::Create( |
this, |
@@ -65,14 +65,14 @@ bool SafeManifestParser::OnMessageReceived(const IPC::Message& message) { |
void SafeManifestParser::OnParseUpdateManifestSucceeded( |
const UpdateManifest::Results& results) { |
VLOG(2) << "parsing manifest succeeded (" << fetch_data_->full_url() << ")"; |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
update_callback_.Run(*fetch_data_, &results); |
} |
void SafeManifestParser::OnParseUpdateManifestFailed( |
const std::string& error_message) { |
VLOG(2) << "parsing manifest failed (" << fetch_data_->full_url() << ")"; |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
LOG(WARNING) << "Error parsing update manifest:\n" << error_message; |
update_callback_.Run(*fetch_data_, NULL); |
} |