Abstract suffixing logic away from GetApplicationName

chrome/browser/shell_integration_win.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 "chrome/browser/shell_integration.h"
 
 #include <windows.h>
 #include <shobjidl.h>
 #include <propkey.h>
 #include <propvarutil.h>
@@ skipping 94 matching lines @@
       CLSID_ApplicationAssociationRegistration, NULL, CLSCTX_INPROC);
   if (FAILED(hr))
     return ShellIntegration::UNKNOWN_DEFAULT_WEB_CLIENT;
 
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   FilePath chrome_exe;
   if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
     NOTREACHED();
     return ShellIntegration::UNKNOWN_DEFAULT_WEB_CLIENT;
   }
-  string16 app_name(dist->GetApplicationName());
-  app_name += ShellUtil::GetCurrentInstallationSuffix(dist, chrome_exe.value());
+  string16 app_name(ShellUtil::GetApplicationName(dist, chrome_exe.value()));
 
   BOOL result;
   for (size_t i = 0; i < num_protocols; ++i) {
     result = TRUE;
     hr = registration->QueryAppIsDefault(protocols[i], AT_URLPROTOCOL,
         AL_EFFECTIVE, app_name.c_str(), &result);
     if (FAILED(hr) || result == FALSE)
       return ShellIntegration::NOT_DEFAULT_WEB_CLIENT;
   }
 
@@ skipping 467 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&MigrateChromiumShortcutsCallback));
 }
 
 bool ShellIntegration::ActivateMetroChrome() {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   const string16 app_id(dist->GetBrowserAppId());
   return ActivateApplication(app_id);
 }