Improve UI for unpacked extensions failing to load

chrome/browser/extensions/unpacked_installer.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/unpacked_installer.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 267 matching lines @@
           extension_path_,
           installer_.extension()->manifest()->value(),
           &error)) {
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(&UnpackedInstaller::ReportExtensionLoadError, this, error));
     return;
   }
 
-  // The installation prompt is about to be shown, which means we're past the
-  // point of detecting installation errors. We can now safely remove the retry
-  // handler that listens for them.
-  BrowserThread::PostTask(
-      BrowserThread::UI,
-      FROM_HERE,
-      base::Bind(&UnpackedInstaller::UnregisterLoadRetryListener, this));
-
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&UnpackedInstaller::ShowInstallPrompt, this));
 }
 
-void UnpackedInstaller::UnregisterLoadRetryListener() {
+void UnpackedInstaller::ReportExtensionLoadError(const std::string &error) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  if (!on_failure_callback_.is_null())
+    on_failure_callback_.Run(extension_path_, error);
+
   if (!service_weak_.get())
     return;

[not at google - send to devlin, 2014/04/25 17:10:20]

this file is quite broken, but I'm scared to touch it.

one tiny cleanup here is to remove the early-return since it doesn't add
anything (if (service_weak_.get()) service_weak_->...;

[Devlin, 2014/04/25 18:13:12]

Done.

-  service_weak_->NotifyLoadRetry(false, extension_path_);
-}
-
-void UnpackedInstaller::ReportExtensionLoadError(const std::string &error) {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (!service_weak_.get())
-    return;
-  service_weak_->ReportExtensionLoadError(extension_path_, error, true);
+  service_weak_->ReportExtensionLoadError(extension_path_, error);
 }
 
 void UnpackedInstaller::ConfirmInstall() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   base::string16 error = installer_.CheckManagementPolicy();
   if (!error.empty()) {
     ReportExtensionLoadError(base::UTF16ToUTF8(error));
     return;
   }
 
   PermissionsUpdater perms_updater(service_weak_->profile());
   perms_updater.GrantActivePermissions(installer_.extension().get());
 
   service_weak_->OnExtensionInstalled(
       installer_.extension().get(),
       syncer::StringOrdinal(),
       false /* no requirement errors */,
       NOT_BLACKLISTED,
       false /* don't wait for idle */);
 }
 
 }  // namespace extensions