  #endif
  
    // Don't prompt for file types that are marked for opening automatically.
---- a/chrome/browser/download/notification/download_item_notification.cc
-+++ b/chrome/browser/download/notification/download_item_notification.cc
-@@ -193,7 +193,7 @@ void RecordButtonClickAction(DownloadCom
- 
- bool IsExtensionDownload(DownloadUIModel* item) {
-   return item->download() &&
--         download_crx_util::IsExtensionDownload(*item->download());
-+         item->IsExtensionDownload();
- }
- 
- }  // namespace
 --- a/chrome/browser/extensions/extension_management.cc
 +++ b/chrome/browser/extensions/extension_management.cc
 @@ -8,6 +8,7 @@

   // No allowed install sites specified, disallow by default.
   if (!global_settings_->has_restricted_install_sources)
     return false;
--- a/chrome/browser/extensions/webstore_installer.cc
+++ b/chrome/browser/extensions/webstore_installer.cc
@@ -510,7 +510,8 @@ void WebstoreInstaller::OnDownloadUpdate
 
       // Only wait for other notifications if the download is really
       // an extension.
-      if (!download_crx_util::IsExtensionDownload(*download)) {
+      if (!download_crx_util::IsExtensionDownload(*download) ||
+          download_crx_util::ShouldDownloadAsRegularFile()) {
         ReportFailure(kInvalidDownloadError, FAILURE_REASON_OTHER);
         return;
       }

     {"enable-stacked-tab-strip",
      "Enable stacking in tab strip",
      "Forces tabs to be stacked in the tab strip. Otherwise, they follow default behavior.",
--- a/chrome/browser/download/download_crx_util.cc
+++ b/chrome/browser/download/download_crx_util.cc
@@ -6,6 +6,7 @@
