Refactor chrome_launcher_support::GetAnyChromePath.

chrome/app_shim/win/app_shim_main.cc

Index: chrome/app_shim/win/app_shim_main.cc
diff --git a/chrome/app_shim/win/app_shim_main.cc b/chrome/app_shim/win/app_shim_main.cc
index 60a62aca9fc3401fb212b043e9586e6cc956c4de..6835f258bd9345c1ff5e69c65551a6d1e4f7fbb6 100644
--- a/chrome/app_shim/win/app_shim_main.cc
+++ b/chrome/app_shim/win/app_shim_main.cc
@@ -22,11 +22,6 @@ const int kLaunchFailure = 2;
 // Command-line switches.
 const char kChromeSxS[] = "chrome-sxs";
 
-base::FilePath GetChromeExePath(bool is_canary) {
-  return is_canary ? chrome_launcher_support::GetAnyChromeSxSPath()
-                   : chrome_launcher_support::GetAnyChromePath();
-}
-
 }  // namespace
 
 // This program runs chrome.exe, passing its arguments on to the Chrome binary.
@@ -55,10 +50,10 @@ int WINAPI wWinMain(HINSTANCE instance,
   logging::InitLogging(logging_settings);
 
   // Get the command-line for the Chrome binary.
-  // --chrome-sxs on the command line means we should run the canary binary.
-  bool is_canary =
-      base::CommandLine::ForCurrentProcess()->HasSwitch(kChromeSxS);
-  base::FilePath chrome_path = GetChromeExePath(is_canary);
+  // --chrome-sxs on the command line means we should run the SxS binary.
+  bool is_sxs = base::CommandLine::ForCurrentProcess()->HasSwitch(kChromeSxS);
+  base::FilePath chrome_path =
+      chrome_launcher_support::GetAnyChromePath(is_sxs);
   if (chrome_path.empty()) {
     LOG(ERROR) << "Could not find chrome.exe path in the registry.";
     return kNoProgram;