Merge 142921 - Use an infobar instead of alert box for extension install

chrome/browser/extensions/extension_install_prompt.h

Index: chrome/browser/extensions/extension_install_prompt.h
===================================================================
--- chrome/browser/extensions/extension_install_prompt.h	(revision 143212)
+++ chrome/browser/extensions/extension_install_prompt.h	(working copy)
@@ -12,6 +12,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
+#include "chrome/browser/extensions/crx_installer_error.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ -205,7 +206,7 @@
                                 SkBitmap* icon);
 
   // Installation failed. This is declared virtual for testing.
-  virtual void OnInstallFailure(const string16& error);
+  virtual void OnInstallFailure(const CrxInstallerError& error);
 
   // ImageLoadingTracker::Observer:
   virtual void OnImageLoaded(const gfx::Image& image,