| Index: chrome/browser/extensions/crx_installer.cc
|
| diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
|
| index bb29ae33aa5b603e81b2399a546129ca65c82464..a90431da1d8d44aace6dc4cf3761f93a50724238 100644
|
| --- a/chrome/browser/extensions/crx_installer.cc
|
| +++ b/chrome/browser/extensions/crx_installer.cc
|
| @@ -247,7 +247,7 @@ void CrxInstaller::ConvertWebAppOnFileThread(
|
| }
|
|
|
| CrxInstallError CrxInstaller::AllowInstall(const Extension* extension) {
|
| - DCHECK(installer_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(installer_task_runner_->RunsTasksInCurrentSequence());
|
|
|
| // Make sure the expected ID matches if one was supplied or if we want to
|
| // bypass the prompt.
|
| @@ -405,7 +405,7 @@ CrxInstallError CrxInstaller::AllowInstall(const Extension* extension) {
|
| }
|
|
|
| void CrxInstaller::OnUnpackFailure(const CrxInstallError& error) {
|
| - DCHECK(installer_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(installer_task_runner_->RunsTasksInCurrentSequence());
|
|
|
| UMA_HISTOGRAM_ENUMERATION("Extensions.UnpackFailureInstallSource",
|
| install_source(), Manifest::NUM_LOCATIONS);
|
| @@ -423,7 +423,7 @@ void CrxInstaller::OnUnpackSuccess(
|
| std::unique_ptr<base::DictionaryValue> original_manifest,
|
| const Extension* extension,
|
| const SkBitmap& install_icon) {
|
| - DCHECK(installer_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(installer_task_runner_->RunsTasksInCurrentSequence());
|
|
|
| UMA_HISTOGRAM_ENUMERATION("Extensions.UnpackSuccessInstallSource",
|
| install_source(), Manifest::NUM_LOCATIONS);
|
| @@ -688,7 +688,7 @@ void CrxInstaller::UpdateCreationFlagsAndCompleteInstall() {
|
| }
|
|
|
| void CrxInstaller::CompleteInstall() {
|
| - DCHECK(installer_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(installer_task_runner_->RunsTasksInCurrentSequence());
|
|
|
| if (current_version_.IsValid() &&
|
| current_version_.CompareTo(*(extension()->version())) > 0) {
|
| @@ -719,7 +719,7 @@ void CrxInstaller::CompleteInstall() {
|
|
|
| void CrxInstaller::ReloadExtensionAfterInstall(
|
| const base::FilePath& version_dir) {
|
| - DCHECK(installer_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(installer_task_runner_->RunsTasksInCurrentSequence());
|
|
|
| if (version_dir.empty()) {
|
| ReportFailureFromFileThread(CrxInstallError(l10n_util::GetStringUTF16(
|
| @@ -750,7 +750,7 @@ void CrxInstaller::ReloadExtensionAfterInstall(
|
| }
|
|
|
| void CrxInstaller::ReportFailureFromFileThread(const CrxInstallError& error) {
|
| - DCHECK(installer_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(installer_task_runner_->RunsTasksInCurrentSequence());
|
| if (!BrowserThread::PostTask(
|
| BrowserThread::UI, FROM_HERE,
|
| base::BindOnce(&CrxInstaller::ReportFailureFromUIThread, this,
|
| @@ -790,7 +790,7 @@ void CrxInstaller::ReportFailureFromUIThread(const CrxInstallError& error) {
|
| }
|
|
|
| void CrxInstaller::ReportSuccessFromFileThread() {
|
| - DCHECK(installer_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(installer_task_runner_->RunsTasksInCurrentSequence());
|
|
|
| // Tracking number of extensions installed by users
|
| if (install_cause() == extension_misc::INSTALL_CAUSE_USER_DOWNLOAD)
|
| @@ -859,7 +859,7 @@ void CrxInstaller::NotifyCrxInstallComplete(bool success) {
|
| }
|
|
|
| void CrxInstaller::CleanupTempFiles() {
|
| - if (!installer_task_runner_->RunsTasksOnCurrentThread()) {
|
| + if (!installer_task_runner_->RunsTasksInCurrentSequence()) {
|
| if (!installer_task_runner_->PostTask(
|
| FROM_HERE, base::BindOnce(&CrxInstaller::CleanupTempFiles, this))) {
|
| NOTREACHED();
|
|
|