Rename the DLL and the executable used by NaCl on Win64 (chrome_nacl_win64.dll -> nacl64.dll, nacl.exe -> nacl64.exe). The motivation for the change:

1. Make the name shorter (look better when installed on users machines)
2. Allow differentiation between 64-bit and 32-bit binaries if we decide to switch to a similar design for 32-bits too.

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

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

4 files changed, 8 insertions, 8 deletions

diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index b0da060..bc4c312 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -471,7 +471,7 @@
         {
           'target_name': 'chrome_dll_nacl_win64',
           'type': 'shared_library',
-          'product_name': 'chrome_nacl_win64',
+          'product_name': 'nacl64',
           'msvs_guid': 'F5B2D851-1279-4CE1-9386-AB7C6433551B',
           'variables': {
             'chrome_dll_target': 1,
@@ -512,8 +512,8 @@
           ],
           'msvs_settings': {
             'VCLinkerTool': {
-              'ImportLibrary': '$(OutDir)\\lib\\chrome_dll_nacl_win64.lib',
-              'ProgramDatabaseFile': '$(OutDir)\\chrome_dll_nacl_win64.pdb',
+              'ImportLibrary': '$(OutDir)\\lib\\nacl64_dll.lib',
+              'ProgramDatabaseFile': '$(OutDir)\\nacl64_dll.pdb',
             },
           },
           'configurations': {
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 5e01465..0eac355 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -487,7 +487,7 @@
         {
           'target_name': 'chrome_nacl_win64',
           'type': 'executable',
-          'product_name': 'nacl',
+          'product_name': 'nacl64',
           'msvs_guid': 'BB1AE956-038B-4092-96A2-951D2B418548',
           'variables': {
             'chrome_exe_target': 1,
@@ -514,8 +514,8 @@
           ],
           'msvs_settings': {
             'VCLinkerTool': {
-              'ImportLibrary': '$(OutDir)\\lib\\nacl_exe.lib',
-              'ProgramDatabaseFile': '$(OutDir)\\nacl_exe.pdb',
+              'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib',
+              'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb',
             },
           },
           'configurations': {
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc
index ed5947a..a4278bb 100644
--- a/chrome/common/chrome_constants.cc
+++ b/chrome/common/chrome_constants.cc
@@ -52,7 +52,7 @@ const FilePath::CharType kHelperProcessExecutablePath[] =
 const FilePath::CharType kFrameworkName[] =
     FPL(PRODUCT_STRING " Framework.framework");
 #endif  // OS_MACOSX
-const wchar_t kNaClAppName[] = L"nacl";
+const wchar_t kNaClAppName[] = L"nacl64";
 #if defined(GOOGLE_CHROME_BUILD)
 const wchar_t kBrowserAppName[] = L"Chrome";
 const char    kStatsFilename[] = "ChromeStats2";
diff --git a/chrome/installer/util/util_constants.cc b/chrome/installer/util/util_constants.cc
index 87aaea3..d56ac9c 100644
--- a/chrome/installer/util/util_constants.cc
+++ b/chrome/installer/util/util_constants.cc
@@ -121,7 +121,7 @@ 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 kChromeDll[] = L"chrome.dll";
-const wchar_t kChromeNaCl64Dll[] = L"chrome_nacl_win64.dll";
+const wchar_t kChromeNaCl64Dll[] = L"nacl64.dll";
 const wchar_t kChromeFrameDll[] = L"npchrome_frame.dll";
 const wchar_t kSetupExe[] = L"setup.exe";
 const wchar_t kInstallerDir[] = L"Installer";