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..49b7b616ffab1864daf5a383d2270f36c9c5b420 100644
--- a/chrome/installer/launcher_support/chrome_launcher_support.h
+++ b/chrome/installer/launcher_support/chrome_launcher_support.h
@@ -19,19 +19,15 @@ enum InstallationLevel {
 // 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.

[grt (UTC plus 2), 2015/01/12 14:02:42]

add the note about |is_sxs| here as well

[Matt Giuca, 2015/01/13 08:22:00]

Done.

-base::FilePath GetChromePathForInstallationLevel(InstallationLevel level);
+base::FilePath GetChromePathForInstallationLevel(InstallationLevel level,
+                                                 bool is_sxs);
 
 // 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
+// identify a Chrome installation location. If |is_sxs| 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 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
-// any) is guaranteed to exist.
-base::FilePath GetAnyChromeSxSPath();
+base::FilePath GetAnyChromePath(bool is_sxs);
 
 }  // namespace chrome_launcher_support