  }
  
 +bool ShouldDownloadAsRegularFile() {
-+    const base::CommandLine& command_line =
-+        *base::CommandLine::ForCurrentProcess();
-+    return command_line.HasSwitch("extension-mime-request-handling") &&
-+        command_line.GetSwitchValueASCII("extension-mime-request-handling") ==
-+        "download-as-regular-file";
++  const base::CommandLine& command_line =
++    *base::CommandLine::ForCurrentProcess();
++  return command_line.HasSwitch("extension-mime-request-handling") &&
++    command_line.GetSwitchValueASCII("extension-mime-request-handling") ==
++    "download-as-regular-file";
 +}
 +
  bool IsExtensionDownload(const DownloadItem& download_item) {
    if (download_item.GetTargetDisposition() ==
        DownloadItem::TARGET_DISPOSITION_PROMPT)
-@@ -134,7 +143,7 @@ bool IsExtensionDownload(const DownloadI
-   if (download_item.GetMimeType() == extensions::Extension::kMimeType ||
-       extensions::UserScript::IsURLUserScript(download_item.GetURL(),
-                                               download_item.GetMimeType())) {
--    return true;
-+    return !ShouldDownloadAsRegularFile();
-   } else {
-     return false;
-   }
 --- a/chrome/browser/download/download_crx_util.h
 +++ b/chrome/browser/download/download_crx_util.h
 @@ -43,6 +43,10 @@ scoped_refptr<extensions::CrxInstaller>

   // No allowed install sites specified, disallow by default.
   if (!global_settings_->has_restricted_install_sources)
     return false;

 #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 @@
