ExternalProvider/Loader: Use DCHECK instead of CHECK for thread checking.
It seems all of the thread checking in external loader/provider code
was done using CHECKs. There isn't any compelling reason to do so, and
it likely happened due to copy-paste spread.
Turn these into DCHECKs. This will reduce any runtime overhead from
release builds.
Bug: None
Test: None
Change-Id: I1370c15fb17acef1c4dd36bc52edd49afc609db0
Reviewed-on: https://chromium-review.googlesource.com/650988
Commit-Queue: Istiaque Ahmed <[email protected]>
Reviewed-by: Devlin <[email protected]>
Cr-Commit-Position: refs/heads/master@{#500731}diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 43515ce4..0c27d53 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -206,7 +206,7 @@
bool ExtensionService::OnExternalExtensionUpdateUrlFound(
const ExternalInstallInfoUpdateUrl& info,
bool is_initial_load) {
- CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
CHECK(crx_file::id_util::IdIsValid(info.extension_id));
if (Manifest::IsExternalLocation(info.download_location)) {
@@ -1329,7 +1329,7 @@
void ExtensionService::OnExternalProviderReady(
const ExternalProviderInterface* provider) {
- CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
CHECK(provider->IsReady());
// An external provider has finished loading. We only take action
@@ -1347,7 +1347,7 @@
}
void ExtensionService::OnAllExternalProvidersReady() {
- CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
base::TimeDelta elapsed = base::Time::Now() - profile_->GetStartTime();
UMA_HISTOGRAM_TIMES("Extension.ExternalProvidersReadyAfter", elapsed);
@@ -2076,7 +2076,7 @@
bool ExtensionService::OnExternalExtensionFileFound(
const ExternalInstallInfoFile& info) {
- CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
CHECK(crx_file::id_util::IdIsValid(info.extension_id));
if (extension_prefs_->IsExternalExtensionUninstalled(info.extension_id))
return false;
diff --git a/chrome/browser/extensions/external_loader.cc b/chrome/browser/extensions/external_loader.cc
index 16deebe..5848be9 100644
--- a/chrome/browser/extensions/external_loader.cc
+++ b/chrome/browser/extensions/external_loader.cc
@@ -18,12 +18,12 @@
}
void ExternalLoader::Init(ExternalProviderImpl* owner) {
- CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
owner_ = owner;
}
const base::FilePath ExternalLoader::GetBaseCrxFilePath() {
- CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
// By default, relative paths are not supported.
// Subclasses that wish to support them should override this method.
@@ -31,7 +31,7 @@
}
void ExternalLoader::OwnerShutdown() {
- CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
owner_ = NULL;
}
@@ -39,7 +39,7 @@
void ExternalLoader::LoadFinished(
std::unique_ptr<base::DictionaryValue> prefs) {
- CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
if (owner_) {
owner_->SetPrefs(std::move(prefs));
}
@@ -47,7 +47,7 @@
void ExternalLoader::OnUpdated(
std::unique_ptr<base::DictionaryValue> updated_prefs) {
- CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
if (owner_)
owner_->UpdatePrefs(std::move(updated_prefs));
}
diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/extensions/external_pref_loader.cc
index a0669f79..353d0ed 100644
--- a/chrome/browser/extensions/external_pref_loader.cc
+++ b/chrome/browser/extensions/external_pref_loader.cc
@@ -170,21 +170,21 @@
Options options,
Profile* profile)
: base_path_id_(base_path_id), options_(options), profile_(profile) {
- CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
}
ExternalPrefLoader::~ExternalPrefLoader() {
}
const base::FilePath ExternalPrefLoader::GetBaseCrxFilePath() {
- CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
// |base_path_| was set in LoadOnFileThread().
return base_path_;
}
void ExternalPrefLoader::StartLoading() {
- CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
if ((options_ & DELAY_LOAD_UNTIL_PRIORITY_SYNC) &&
(profile_ && profile_->IsSyncAllowed())) {
pending_waiter_list_.push_back(
diff --git a/chrome/browser/extensions/external_provider_impl.cc b/chrome/browser/extensions/external_provider_impl.cc
index 25414e4..a0379e9 100644
--- a/chrome/browser/extensions/external_provider_impl.cc
+++ b/chrome/browser/extensions/external_provider_impl.cc
@@ -126,7 +126,7 @@
}
ExternalProviderImpl::~ExternalProviderImpl() {
- CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
loader_->OwnerShutdown();
}
@@ -137,7 +137,7 @@
void ExternalProviderImpl::SetPrefs(
std::unique_ptr<base::DictionaryValue> prefs) {
- CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
// Check if the service is still alive. It is possible that it went
// away while |loader_| was working on the FILE thread.
@@ -164,7 +164,7 @@
void ExternalProviderImpl::UpdatePrefs(
std::unique_ptr<base::DictionaryValue> prefs) {
- CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
// We only expect updates from windows registry or via policies on chromeos.
CHECK(crx_location_ == Manifest::EXTERNAL_REGISTRY ||
download_location_ == Manifest::EXTERNAL_POLICY_DOWNLOAD);
@@ -436,7 +436,7 @@
bool ExternalProviderImpl::HasExtension(
const std::string& id) const {
- CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
CHECK(prefs_.get());
CHECK(ready_);
return prefs_->HasKey(id);
@@ -446,7 +446,7 @@
const std::string& id,
Manifest::Location* location,
std::unique_ptr<base::Version>* version) const {
- CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
CHECK(prefs_.get());
CHECK(ready_);
base::DictionaryValue* extension = NULL;
diff --git a/chrome/browser/extensions/external_registry_loader_win.cc b/chrome/browser/extensions/external_registry_loader_win.cc
index c2e1bdf..e632ffe 100644
--- a/chrome/browser/extensions/external_registry_loader_win.cc
+++ b/chrome/browser/extensions/external_registry_loader_win.cc
@@ -68,7 +68,7 @@
ExternalRegistryLoader::~ExternalRegistryLoader() {}
void ExternalRegistryLoader::StartLoading() {
- CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
GetOrCreateTaskRunner()->PostTask(
FROM_HERE,
base::BindOnce(&ExternalRegistryLoader::LoadOnBlockingThread, this));
