Reland 137540 - Disable off-store extension installs by default. Also get rid of ExtensionService::…

chrome/browser/download/download_crx_util.cc

Index: chrome/browser/download/download_crx_util.cc
diff --git a/chrome/browser/download/download_crx_util.cc b/chrome/browser/download/download_crx_util.cc
index a34ebecc316194cb969a4628ac65f3533cd9389d..8711140c92acfaa549040c6963df0fe8bada1b1e 100644
--- a/chrome/browser/download/download_crx_util.cc
+++ b/chrome/browser/download/download_crx_util.cc
@@ -51,15 +51,6 @@ void SetMockInstallUIForTesting(ExtensionInstallUI* mock_ui) {
   mock_install_ui_for_testing = mock_ui;
 }
 
-bool ShouldOpenExtensionDownload(const DownloadItem& download_item) {
-  if (extensions::switch_utils::IsOffStoreInstallEnabled() ||
-      WebstoreInstaller::GetAssociatedApproval(download_item)) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
 scoped_refptr<CrxInstaller> OpenChromeExtension(
     Profile* profile,
     const DownloadItem& download_item) {
@@ -80,8 +71,8 @@ scoped_refptr<CrxInstaller> OpenChromeExtension(
     installer->InstallUserScript(download_item.GetFullPath(),
                                  download_item.GetURL());
   } else {
-    bool is_gallery_download = service->IsDownloadFromGallery(
-        download_item.GetURL(), download_item.GetReferrerUrl());
+    bool is_gallery_download =
+        WebstoreInstaller::GetAssociatedApproval(download_item) != NULL;
     installer->set_original_mime_type(download_item.GetOriginalMimeType());
     installer->set_apps_require_extension_mime_type(true);
     installer->set_download_url(download_item.GetURL());