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

chrome/browser/download/download_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 <sstream>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 145 matching lines @@
  public:
   MockAbortExtensionInstallPrompt() : ExtensionInstallPrompt(NULL) {}
 
   // Simulate a user abort on an extension installation.
   virtual void ConfirmInstall(Delegate* delegate, const Extension* extension) {
     delegate->InstallUIAbort(true);
     MessageLoopForUI::current()->Quit();
   }
 
   virtual void OnInstallSuccess(const Extension* extension, SkBitmap* icon) {}
-  virtual void OnInstallFailure(const string16& error) {}
+  virtual void OnInstallFailure(const CrxInstallerError& error) {}
 };
 
 // Mock that simulates a permissions dialog where the user allows
 // installation.
 class MockAutoConfirmExtensionInstallPrompt : public ExtensionInstallPrompt {
  public:
   explicit MockAutoConfirmExtensionInstallPrompt(Browser* browser)
       : ExtensionInstallPrompt(browser) {}
 
   // Proceed without confirmation prompt.
   virtual void ConfirmInstall(Delegate* delegate, const Extension* extension) {
     delegate->InstallUIProceed();
   }
 
   virtual void OnInstallSuccess(const Extension* extension, SkBitmap* icon) {}
-  virtual void OnInstallFailure(const string16& error) {}
+  virtual void OnInstallFailure(const CrxInstallerError& error) {}
 };
 
 static DownloadManager* DownloadManagerForBrowser(Browser* browser) {
   return BrowserContext::GetDownloadManager(browser->profile());
 }
 
 class TestRenderViewContextMenu : public RenderViewContextMenu {
  public:
   TestRenderViewContextMenu(WebContents* web_contents,
                             const content::ContextMenuParams& params)
@@ skipping 2258 matching lines @@
   GetDownloads(browser(), &download_items);
   ASSERT_EQ(1u, download_items.size());
   ASSERT_EQ(test_server()->GetURL("echoheader?Referer"),
             download_items[0]->GetOriginalUrl());
 
   // Check that the file contains the expected referrer.
   FilePath file(download_items[0]->GetFullPath());
   std::string expected_contents = test_server()->GetURL("").spec();
   ASSERT_TRUE(VerifyFile(file, expected_contents, expected_contents.length()));
 }