Add 64-bit binaries that are required for NaCl support to Chrome installation on Windows.

NaCl uses two additional binaries on 64-bit Windows: nacl64.exe and nacl64.dll, so these binaries need to be installed and updated as part of Chrome installation/update. 


Review URL: http://codereview.chromium.org/567028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40639 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 0 deletions

diff --git a/chrome/test/mini_installer_test/chrome_mini_installer.cc b/chrome/test/mini_installer_test/chrome_mini_installer.cc
index f6bac58..4ab172d 100644
--- a/chrome/test/mini_installer_test/chrome_mini_installer.cc
+++ b/chrome/test/mini_installer_test/chrome_mini_installer.cc
@@ -209,6 +209,7 @@ void ChromeMiniInstaller::Repair(
     ChromeMiniInstaller::RepairChrome repair_type) {
   InstallFullInstaller(false);
   MiniInstallerTestUtil::CloseProcesses(installer_util::kChromeExe);
+  MiniInstallerTestUtil::CloseProcesses(installer_util::kNaClExe);
   if (repair_type == ChromeMiniInstaller::VERSION_FOLDER) {
     DeleteFolder(L"version_folder");
     printf("Deleted folder. Now trying to launch chrome\n");
@@ -248,6 +249,7 @@ void ChromeMiniInstaller::UnInstall() {
   if (is_chrome_frame_)
     MiniInstallerTestUtil::CloseProcesses(L"IEXPLORE.EXE");
   MiniInstallerTestUtil::CloseProcesses(installer_util::kChromeExe);
+  MiniInstallerTestUtil::CloseProcesses(installer_util::kNaClExe);
   std::wstring uninstall_path = GetUninstallPath();
   if (uninstall_path == L"") {
     printf("\n %ls install is in a weird state. Cleaning the machine...\n",
@@ -342,6 +344,10 @@ bool ChromeMiniInstaller::CloseChromeBrowser() {
     printf("Chrome.exe is still running even after closing all windows\n");
     return false;
   }
+  if (base::GetProcessCount(installer_util::kNaClExe, NULL) > 0) {
+    printf("NaCl.exe is still running even after closing all windows\n");
+    return false;
+  }
   return true;
 }