Refactor chrome_launcher_support::GetAnyChromePath.

chrome/installer/launcher_support/chrome_launcher_support.h

Index: chrome/installer/launcher_support/chrome_launcher_support.h
diff --git a/chrome/installer/launcher_support/chrome_launcher_support.h b/chrome/installer/launcher_support/chrome_launcher_support.h
index 8c0b2d4d5f99c1807926163a06e5f3c52d702a42..f1d4a7d16ccf039bdca7258b17afc94b6d04cd7a 100644
--- a/chrome/installer/launcher_support/chrome_launcher_support.h
+++ b/chrome/installer/launcher_support/chrome_launcher_support.h
@@ -23,15 +23,10 @@ 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