Abstract suffixing logic away from GetApplicationName

chrome/installer/util/browser_distribution.cc

Index: chrome/installer/util/browser_distribution.cc
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
index 6ca1b42bf68823002834aa41840d31f9c42ffaba..7e9ddcb782464ef66da17a016322f6127f177464 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -25,6 +25,7 @@
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/master_preferences.h"
+#include "chrome/installer/util/shell_util.h"
 
 #include "installer_util_strings.h"  // NOLINT
 
@@ -149,12 +150,18 @@ string16 BrowserDistribution::GetAppGuid() {
   return L"";
 }
 
-string16 BrowserDistribution::GetApplicationName() {
+string16 BrowserDistribution::GetAppName() {
+  string16 app_name(GetUnsuffixedAppName());
+  app_name += ShellUtil::GetCurrentInstallationSuffix();

[grt (UTC plus 2), 2012/06/01 14:11:29]

Please move this functionality into ShellUtil and change consumers so that
instead of calling BrowserDistribution::GetApplicationName and then doing stuff
to it, they call ShellUtil::GetApplicationName (or somesuch), which gets the
base part from a BrowserDistribution* and then adds the suffix if needed.

[gab, 2012/06/01 16:29:19]

Done.

+  return app_name;
+}
+
+string16 BrowserDistribution::GetUnsuffixedAppName() {
   return L"Chromium";
 }
 
 string16 BrowserDistribution::GetAppShortCutName() {
-  return GetApplicationName();
+  return GetUnsuffixedAppName();
 }
 
 string16 BrowserDistribution::GetAlternateApplicationName() {