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

chrome/browser/extensions/crx_installer_browsertest.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/download/download_crx_util.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_test_observer.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
@@ skipping 29 matching lines @@
   void ConfirmInstall(Delegate* delegate,
                       const extensions::Extension* extension) {
     confirmation_requested_ = true;
     delegate->InstallUIProceed();
   }
   void OnInstallSuccess(const extensions::Extension* extension,
                         SkBitmap* icon) {
     did_succeed_ = true;
     MessageLoopForUI::current()->Quit();
   }
-  void OnInstallFailure(const string16& error) {
-    error_ = error;
+  void OnInstallFailure(const CrxInstallerError& error) {
+    error_ = error.message();
     MessageLoopForUI::current()->Quit();
   }
 
  private:
   bool did_succeed_;
   bool confirmation_requested_;
   string16 error_;
 };
 
 }  // namespace
@@ skipping 141 matching lines @@
         kTestData[i];
     if (kTestData[i]) {
       EXPECT_EQ(string16(), mock_prompt->error()) << kTestData[i];
     } else {
       EXPECT_EQ(l10n_util::GetStringUTF16(
           IDS_EXTENSION_INSTALL_DISALLOWED_ON_SITE),
           mock_prompt->error()) << kTestData[i];
     }
   }
 }