Refactor chrome_launcher_support::GetAnyChromePath.

chrome/installer/launcher_support/chrome_launcher_support.h

 // 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.
 
 #ifndef CHROME_INSTALLER_LAUNCHER_SUPPORT_CHROME_LAUNCHER_SUPPORT_H_
 #define CHROME_INSTALLER_LAUNCHER_SUPPORT_CHROME_LAUNCHER_SUPPORT_H_
 
 namespace base {
 class FilePath;
 }
 
 namespace chrome_launcher_support {
 
 enum InstallationLevel {
   USER_LEVEL_INSTALLATION,
   SYSTEM_LEVEL_INSTALLATION,
 };
 
 // Returns the path to an installed chrome.exe at the specified level, if it can
 // be found in the registry. Prefers the installer from a multi-install, but may
 // also return that of a single-install of Chrome if no multi-install exists.
 base::FilePath GetChromePathForInstallationLevel(InstallationLevel level);
 
 // Returns the path to an installed chrome.exe, or an empty path. Prefers a
 // system-level installation to a user-level installation. Uses the registry to
-// identify a Chrome installation location. The file path returned (if any) is
-// guaranteed to exist.
-base::FilePath GetAnyChromePath();
-
-// Returns the path to an installed SxS chrome.exe, or an empty path. Prefers a
-// user-level installation to a system-level installation. Uses the registry to
-// identify a Chrome Canary installation location. The file path returned (if
+// identify a Chrome installation location. If |is_canary| is true, gets the
+// path to the SxS (Canary) version of chrome.exe. The file path returned (if
 // any) is guaranteed to exist.
-base::FilePath GetAnyChromeSxSPath();
+base::FilePath GetAnyChromePath(bool is_canary);

[grt (UTC plus 2), 2015/01/09 17:45:28]

Now that I think about it, |is_canary| is a bad name for this. Canary is the
name of the update channel (stable, beta, dev, canary) and not the name of the
type of install (normal or SxS). The relevant names in chrome/installer/util are
things like InstallUtil::IsChromeSxSProcess and GoogleChromeSxsDistribution.
Please change is_canary to chrome_sxs or something like that here and elsewhere.

[Matt Giuca, 2015/01/12 06:54:26]

OK I wasn't aware of that distinction. Updated the names here and in app_shim.

 
 }  // namespace chrome_launcher_support
 
 #endif  // CHROME_INSTALLER_LAUNCHER_SUPPORT_CHROME_LAUNCHER_SUPPORT_H_