Abstract suffixing logic away from GetApplicationName

chrome/installer/setup/setup_main.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <windows.h>
 #include <msi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include "base/at_exit.h"
@@ skipping 140 matching lines @@
     for (size_t i = 0; i < BrowserDistribution::kNumProductTypes; ++i) {
       BrowserDistribution::Type type = BrowserDistribution::kProductTypes[i];
       if (!installer_state->FindProduct(type)) {
         const ProductState* state =
             original_state.GetProductState(installer_state->system_install(),
                                            type);
         if ((state != NULL) && state->is_multi_install()) {
           installer_state->AddProductFromState(type, *state);
           VLOG(1) << "Product already installed and must be included: "
                   << BrowserDistribution::GetSpecificDistribution(
-                         type)->GetApplicationName();
+                         type)->GetAppShortCutName();
         }
       }
     }
   }
 }
 
 // This function is called when --rename-chrome-exe option is specified on
 // setup.exe command line. This function assumes an in-use update has happened
 // for Chrome so there should be a file called new_chrome.exe on the file
 // system and a key called 'opv' in the registry. This function will move
@@ skipping 219 matching lines @@
                                          BrowserDistribution::CHROME_BROWSER);
       if (chrome_state != NULL) {
         // Add Chrome to the set of products (making it multi-install in the
         // process) so that it is updated, too.
         scoped_ptr<Product> multi_chrome(new Product(
             BrowserDistribution::GetSpecificDistribution(
                 BrowserDistribution::CHROME_BROWSER)));
         multi_chrome->SetOption(installer::kOptionMultiInstall, true);
         chrome = installer_state->AddProduct(&multi_chrome);
         VLOG(1) << "Upgrading existing multi-install Chrome browser along with "
-                << chrome_frame->distribution()->GetApplicationName();
+                << chrome_frame->distribution()->GetAppShortCutName();
       } else if (chrome_frame->HasOption(installer::kOptionReadyMode)) {
         // Chrome Frame with ready-mode is to be installed, yet Chrome is
         // neither installed nor being installed.  Fail.
         LOG(ERROR) << "Cannot install Chrome Frame in ready mode without "
                       "Chrome.";
         *status = installer::READY_MODE_REQUIRES_CHROME;
         installer_state->WriteInstallerResult(*status,
             IDS_INSTALL_READY_MODE_REQUIRES_CHROME_BASE, NULL);
         return false;
       }
@@ skipping 60 matching lines @@
     BrowserDistribution* browser_dist = product->distribution();
 
     // Check for an existing installation of the product.
     const ProductState* product_state =
         original_state.GetProductState(system_level, browser_dist->GetType());
     if (product_state != NULL) {
       is_first_install = false;
       // Block downgrades from multi-install to single-install.
       if (!installer_state->is_multi_install() &&
           product_state->is_multi_install()) {
-        LOG(ERROR) << "Multi-install " << browser_dist->GetApplicationName()
+        LOG(ERROR) << "Multi-install " << browser_dist->GetAppShortCutName()
                    << " exists; aborting single install.";
         *status = installer::MULTI_INSTALLATION_EXISTS;
         installer_state->WriteInstallerResult(*status,
             IDS_INSTALL_MULTI_INSTALLATION_EXISTS_BASE, NULL);
         return false;
       }
     }
 
     // Check to avoid attempting to lay down a user-level installation on top
     // of a system-level one.
@@ skipping 894 matching lines @@
   if (!(installer_state.is_msi() && is_uninstall))
     // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
     // to pass through, since this is only returned on uninstall which is
     // never invoked directly by Google Update.
     return_code = InstallUtil::GetInstallReturnCode(install_status);
 
   VLOG(1) << "Installation complete, returning: " << return_code;
 
   return return_code;
 }