Merge 22244 - Try again to land: http://codereview.chromium.org/160483...

chrome/browser/download/download_manager.cc

Index: chrome/browser/download/download_manager.cc
===================================================================
--- chrome/browser/download/download_manager.cc	(revision 23141)
+++ chrome/browser/download/download_manager.cc	(working copy)
@@ -19,6 +19,7 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_file.h"
+#include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
@@ -1251,9 +1252,17 @@
                                           const GURL& download_url,
                                           const GURL& referrer_url) {
   // We don't support extensions in OTR mode.
-  if (profile_->GetExtensionsService())
-    profile_->GetExtensionsService()->InstallExtension(full_path, download_url,
-                                                       referrer_url);
+  ExtensionsService* service = profile_->GetExtensionsService();
+  if (service) {
+    CrxInstaller::Start(full_path,
+                        service->install_directory(),
+                        Extension::INTERNAL,
+                        "",  // no expected id
+                        true,  // please delete crx on completion
+                        g_browser_process->file_thread()->message_loop(),
+                        service,
+                        new ExtensionInstallUI(profile_));
+  }
 }
 
 void DownloadManager::OpenDownloadInShell(const DownloadItem* download,
Property changes on: chrome\browser\download\download_manager.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/download/download_manager.cc:r22244