Abstract suffixing logic away from GetApplicationName

chrome/installer/setup/uninstall.cc

Index: chrome/installer/setup/uninstall.cc
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index e7f55523849e347a159bdabac7e1376880d371fb..782500fdfcec8df8641a8335d2e18f595b48adb8 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -572,7 +572,7 @@ bool DeleteChromeRegistrationKeys(BrowserDistribution* dist, HKEY root,
 
   // Delete Software\RegisteredApplications\Chromium
   InstallUtil::DeleteRegistryValue(root, ShellUtil::kRegRegisteredApplications,
-      dist->GetApplicationName() + browser_entry_suffix);
+      dist->GetUnsuffixedAppName() + browser_entry_suffix);
 
   // Delete Software\Classes\Applications\chrome.exe
   string16 app_key(ShellUtil::kRegClasses);
@@ -609,7 +609,7 @@ bool DeleteChromeRegistrationKeys(BrowserDistribution* dist, HKEY root,
   // lives in HKLM.
   InstallUtil::DeleteRegistryValueIf(
       root, ShellUtil::kRegStartMenuInternet, L"",
-      InstallUtil::ValueEquals(dist->GetApplicationName() +
+      InstallUtil::ValueEquals(dist->GetUnsuffixedAppName() +
                                browser_entry_suffix));
 
   // Delete each protocol association if it references this Chrome.
@@ -710,7 +710,7 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
 
   bool is_chrome = product.is_chrome();
 
-  VLOG(1) << "UninstallProduct: " << browser_dist->GetApplicationName();
+  VLOG(1) << "UninstallProduct: " << browser_dist->GetUnsuffixedAppName();
 
   if (force_uninstall) {
     // Since --force-uninstall command line option is used, we are going to