Refactor chrome_launcher_support::GetAnyChromePath.

chrome/app_installer/win/app_installer_main.cc

 // Copyright 2014 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 <windows.h>
 #include <initguid.h>
 #include <urlmon.h>
 #pragma comment(lib, "urlmon.lib")
 
 #include "base/at_exit.h"
@@ skipping 168 matching lines @@
 
   for (size_t i = 0; i < app_id.size(); ++i) {
     char c = base::ToLowerASCII(app_id[i]);
     if (c < 'a' || c > 'p')
       return false;
   }
 
   return true;
 }
 
-base::FilePath GetChromeExePath(bool is_canary) {
-  return is_canary ? chrome_launcher_support::GetAnyChromeSxSPath()
-                   : chrome_launcher_support::GetAnyChromePath();
-}
-
 ExitCode GetChrome(bool is_canary) {
   // Show UI to install Chrome. The UI returns a download URL.
   base::string16 download_url =
       DownloadAndEulaHTMLDialog(is_canary).ShowModal();
   if (download_url.empty())
     return EULA_CANCELLED;
 
   DVLOG(1) << "Chrome download url: " << download_url;
 
   // Get a temporary file path.
@@ skipping 66 matching lines @@
 
     if (!is_canary) {
       result = parsed_pairs.find(sxs);
       is_canary = result != parsed_pairs.end() && result->second == "1";
     }
   }
 
   if (!IsValidAppId(app_id))
     return INVALID_APP_ID;
 
-  base::FilePath chrome_path = GetChromeExePath(is_canary);
+  base::FilePath chrome_path =
+      chrome_launcher_support::GetAnyChromePath(is_canary);
   // If none found, show EULA, download, and install Chrome.
   if (chrome_path.empty()) {
     ExitCode get_chrome_result = GetChrome(is_canary);
     if (get_chrome_result != SUCCESS)
       return get_chrome_result;
 
-    chrome_path = GetChromeExePath(is_canary);
+    chrome_path = chrome_launcher_support::GetAnyChromePath(is_canary);
     if (chrome_path.empty())
       return COULD_NOT_FIND_CHROME;
   }
 
   base::CommandLine cmd(chrome_path);
   cmd.AppendSwitchASCII(kInstallChromeApp, app_id);
   DVLOG(1) << "Install command: " << cmd.GetCommandLineString();
   bool launched = base::LaunchProcess(cmd, base::LaunchOptions(), NULL);
   DVLOG(1) << "Launch " << (launched ? "success." : "failed.");
 
   return SUCCESS;
 }
 
 }  // namespace app_installer