[Extensions] Fix install prompt icon bug

chrome/browser/extensions/extension_install_prompt.cc

 // Copyright (c) 2012 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/extension_install_prompt.h"
 
 #include "base/location.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 651 matching lines @@
     Delegate* delegate,
     const Extension* extension,
     const SkBitmap* icon,
     scoped_ptr<Prompt> prompt,
     scoped_ptr<const PermissionSet> custom_permissions,
     const ShowDialogCallback& show_dialog_callback) {
   DCHECK(ui_loop_ == base::MessageLoop::current());
   DCHECK(prompt);
   extension_ = extension;
   delegate_ = delegate;
-  SetIcon(icon);
+  if (icon && !icon->empty())
+    SetIcon(icon);

[Devlin, 2015/12/17 22:21:14]

D'oh.  Forgot that SetIcon() sets the default if |icon| is null, meaning that
LoadImageIfNeeded was always not needed.

   prompt_ = prompt.Pass();
   custom_permissions_ = custom_permissions.Pass();
   show_dialog_callback_ = show_dialog_callback;
 
   // We special-case themes to not show any confirm UI. Instead they are
   // immediately installed, and then we show an infobar (see OnInstallSuccess)
   // to allow the user to revert if they don't like it.
   //
   // We don't do this in the case where off-store extension installs are
   // disabled because in that case, we don't show the dangerous download UI, so
@@ skipping 153 matching lines @@
     delegate_->InstallUIAbort(false);
     return;
   }
 
   if (show_dialog_callback_.is_null())
     GetDefaultShowDialogCallback().Run(show_params_.get(), delegate_,
                                        prompt_.Pass());
   else
     show_dialog_callback_.Run(show_params_.get(), delegate_, prompt_.Pass());
 }