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

8 files changed, 22 insertions, 0 deletions

diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index 762df0a..9bc4313 100755
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -171,6 +171,8 @@
                 '<(create_installer_archive_py_path)',
                 '<(PRODUCT_DIR)/chrome.exe',
                 '<(PRODUCT_DIR)/chrome.dll',
+                '<(PRODUCT_DIR)/nacl64.exe',
+                '<(PRODUCT_DIR)/nacl64.dll',
                 '<(PRODUCT_DIR)/locales/en-US.dll',
                 '<(PRODUCT_DIR)/icudt42.dll',
               ],
@@ -223,6 +225,8 @@
                 '<(create_installer_archive_py_path)',
                 '<(PRODUCT_DIR)/chrome.exe',
                 '<(PRODUCT_DIR)/chrome.dll',
+                '<(PRODUCT_DIR)/nacl64.exe',
+                '<(PRODUCT_DIR)/nacl64.dll',
                 '<(PRODUCT_DIR)/locales/en-US.dll',
                 '<(PRODUCT_DIR)/icudt42.dll',
               ],
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index 1a46d06..f3d07bf 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -32,6 +32,8 @@ chrome.exe: %(ChromeDir)s\
 wow_helper.exe: %(ChromeDir)s\
 Dictionaries\en-US.bdic: %(ChromeDir)s\Dictionaries
 chrome.dll: %(VersionDir)s\
+nacl64.exe: %(VersionDir)s\
+nacl64.dll: %(VersionDir)s\
 icudt42.dll: %(VersionDir)s\
 gears.dll: %(VersionDir)s\
 Themes\default.dll: %(VersionDir)s\Themes
diff --git a/chrome/installer/mini_installer/chrome_frame.release b/chrome/installer/mini_installer/chrome_frame.release
index 8237c65..a673f13 100644
--- a/chrome/installer/mini_installer/chrome_frame.release
+++ b/chrome/installer/mini_installer/chrome_frame.release
@@ -32,6 +32,8 @@ chrome.exe: %(ChromeDir)s\
 wow_helper.exe: %(ChromeDir)s\
 Dictionaries\en-US.bdic: %(ChromeDir)s\Dictionaries
 chrome.dll: %(VersionDir)s\
+nacl64.exe: %(VersionDir)s\
+nacl64.dll: %(VersionDir)s\
 icudt42.dll: %(VersionDir)s\
 gears.dll: %(VersionDir)s\
 Themes\default.dll: %(VersionDir)s\Themes
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 7ae3b77..d957ecc 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -47,6 +47,8 @@ void CloseAllChromeProcesses() {
           (GetLastError() == ERROR_TIMEOUT)) {
         base::CleanupProcesses(installer_util::kChromeExe, 0,
                                ResultCodes::HUNG, NULL);
+        base::CleanupProcesses(installer_util::kNaClExe, 0,
+                               ResultCodes::HUNG, NULL);
         return;
       }
     }
@@ -57,6 +59,8 @@ void CloseAllChromeProcesses() {
   // messages.
   base::CleanupProcesses(installer_util::kChromeExe, 15000,
                          ResultCodes::HUNG, NULL);
+  base::CleanupProcesses(installer_util::kNaClExe, 15000,
+                         ResultCodes::HUNG, NULL);
 }
 
 // This method tries to figure out if current user has registered Chrome.
diff --git a/chrome/installer/util/util_constants.cc b/chrome/installer/util/util_constants.cc
index d56ac9c..aa3539e 100644
--- a/chrome/installer/util/util_constants.cc
+++ b/chrome/installer/util/util_constants.cc
@@ -120,6 +120,7 @@ const wchar_t kInstallUserDataDir[] = L"User Data";
 const wchar_t kChromeExe[] = L"chrome.exe";
 const wchar_t kChromeOldExe[] = L"old_chrome.exe";
 const wchar_t kChromeNewExe[] = L"new_chrome.exe";
+const wchar_t kNaClExe[] = L"nacl64.exe";
 const wchar_t kChromeDll[] = L"chrome.dll";
 const wchar_t kChromeNaCl64Dll[] = L"nacl64.dll";
 const wchar_t kChromeFrameDll[] = L"npchrome_frame.dll";
diff --git a/chrome/installer/util/util_constants.h b/chrome/installer/util/util_constants.h
index 1fc582f..9714e84 100644
--- a/chrome/installer/util/util_constants.h
+++ b/chrome/installer/util/util_constants.h
@@ -87,6 +87,7 @@ extern const wchar_t kInstallUserDataDir[];
 extern const wchar_t kChromeExe[];
 extern const wchar_t kChromeOldExe[];
 extern const wchar_t kChromeNewExe[];
+extern const wchar_t kNaClExe[];
 extern const wchar_t kChromeDll[];
 extern const wchar_t kChromeNaCl64Dll[];
 extern const wchar_t kChromeFrameDll[];
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;
 }
 
diff --git a/chrome/tools/build/win/FILES b/chrome/tools/build/win/FILES
index c8de19c..2b42504 100644
--- a/chrome/tools/build/win/FILES
+++ b/chrome/tools/build/win/FILES
@@ -2,7 +2,9 @@ avcodec-52.dll
 avformat-52.dll
 avutil-50.dll
 chrome.exe
+nacl64.exe
 chrome.dll
+nacl64.dll
 crash_service.exe
 First Run
 gears.dll